From 67e03b179e1a257622cf2b5b21ec0610115c3bf9 Mon Sep 17 00:00:00 2001
From: chenhuan <czj123456>
Date: 星期二, 28 五月 2024 17:48:40 +0800
Subject: [PATCH] Merge branch 'master' of http://117.78.1.188:8089/r/dkyChenJiang
---
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/HoleController.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 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..0cbe91d 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;
@@ -52,6 +55,12 @@
return getDataTable(list);
}
+ @GetMapping("/holelist")
+ @ResponseBody
+ public AjaxResult holelist(Hole hole) {
+ List<Hole> list = holeService.selectHoleList(hole);
+ return AjaxResult.success(list);
+ }
/**
* 瀵煎嚭閽诲瓟鍒楄〃
@@ -104,9 +113,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;
+ }
+
/**
* 鍒犻櫎閽诲瓟
*/
--
Gitblit v1.9.1