From 5606efe6f2778ad09d8b35280d6360cfe8f34d91 Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期三, 03 七月 2024 16:19:28 +0800
Subject: [PATCH] Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang
---
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/HoleController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 2b7c86f..fc7ad29 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
@@ -71,7 +71,10 @@
public AjaxResult holeProcess(Hole hole) {
Hole hole2 = holeMapper.selectProjectProcess(hole.getProjectId());
- Double process = Arith.div(hole2.getFootageCpl(), hole2.getFootage(), 2);
+ Double process =0.0d;
+ if(ObjectUtil.isNotEmpty(hole2.getFootageCpl()) && ObjectUtil.isNotEmpty(hole2.getFootage())) {
+ process = Arith.div(hole2.getFootageCpl(), hole2.getFootage(), 2);
+ }
return AjaxResult.success(process);
}
@@ -130,16 +133,13 @@
@PostMapping("/edit")
@ResponseBody
public AjaxResult editSave(Hole hole) {
- if(isNotNull(hole.getFootage()) && isNotNull(hole.getFootageCpl())){
+ if(ObjectUtil.isNotEmpty(hole.getFootage()) && ObjectUtil.isNotEmpty(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