From 140c701242e3f003df44580f523118fe62a74c76 Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期六, 18 五月 2024 10:56:33 +0800
Subject: [PATCH] 提交代码
---
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/hole.html | 21 ++++++++++++++++++---
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/add.html | 8 ++++----
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/HoleController.java | 11 +++++++++++
3 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/HoleController.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/HoleController.java
index 307390f..342a31c 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/HoleController.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/HoleController.java
@@ -2,6 +2,9 @@
import java.util.List;
+import cn.hutool.core.math.MathUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.javaweb.common.utils.Arith;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -104,9 +107,17 @@
@PostMapping("/edit")
@ResponseBody
public AjaxResult editSave(Hole hole) {
+ if(isNotNull(hole.getFootage()) && isNotNull(hole.getFootageCpl())){
+ Double rate = Arith.div(hole.getFootageCpl(),hole.getFootage(),2) ;
+ hole.setRate(rate);
+ }
return toAjax(holeService.updateHole(hole));
}
+ private boolean isNotNull(Double val){
+ return val !=null && val !=0.0D;
+ }
+
/**
* 鍒犻櫎閽诲瓟
*/
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/add.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/add.html
index 1648534..d178bb9 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/add.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/add.html
@@ -14,13 +14,13 @@
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">瀛斿彛楂樼▼锛�</label>
+ <label class="col-sm-3 control-label">瀛斿彛楂樼▼(m)锛�</label>
<div class="col-sm-8">
<input name="elevation" class="form-control" type="text">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">璁捐瀛旀繁锛�</label>
+ <label class="col-sm-3 control-label">璁捐瀛旀繁(m)锛�</label>
<div class="col-sm-8">
<input name="depth" class="form-control" type="text">
</div>
@@ -38,9 +38,9 @@
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">鎬昏繘灏猴細</label>
+ <label class="col-sm-3 control-label">鎬昏繘灏�(m)锛�</label>
<div class="col-sm-8">
- <input name="footage" class="form-control" type="text" placeholder="璇疯緭鍏ユ�昏繘灏�">
+ <input name="footage" class="form-control" type="text" placeholder="璇疯緭鍏ユ�昏繘灏�,鍗曚綅锛坢锛�">
</div>
</div>
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/hole.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/hole.html
index 0079353..7665a41 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/hole.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/hole.html
@@ -86,11 +86,11 @@
},
{
field : 'elevation',
- title : '瀛斿彛楂樼▼'
+ title : '瀛斿彛楂樼▼锛坢锛�'
},
{
field : 'depth',
- title : '璁捐瀛旀繁'
+ title : '璁捐瀛旀繁锛坢锛�'
},
{
field : 'longitude',
@@ -110,8 +110,23 @@
}
},
{
+ field : 'footage',
+ title : '鎬昏繘灏猴紙m锛�',
+ },
+ {
+ field : 'footageCpl',
+ title : '宸插畬鎴愯繘灏猴紙m锛�',
+ },
+ {
field : 'rate',
- title : '杩涘害',
+ title : '瀹屾垚杩涘害(%)',
+ formatter: function(value, row, index) {
+ if (row.rate !=null){
+ return (row.rate*100).toFixed(2) + "%";
+ }else{
+ return "0%";
+ }
+ }
},
{
title: '鎿嶄綔',
--
Gitblit v1.9.1