From fc2adc3521931c2f7bc5b2f3a3d94ebf407828d6 Mon Sep 17 00:00:00 2001
From: yxm <zhp1521624>
Date: Mon, 01 Jul 2024 09:40:55 +0800
Subject: [PATCH] 水库堤防白蚁普查资料当前页压缩导出新增条件优化v20240701

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResFlseLimServiceImpl.java |   24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResFlseLimServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResFlseLimServiceImpl.java
index fece656..c68c2ba 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResFlseLimServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResFlseLimServiceImpl.java
@@ -60,11 +60,11 @@
 
 			JSONObject paramJson = new JSONObject();
 			paramJson.put("time", DateUtil.format(new Date(),"yyyy-MM-dd"));
-			String editPar = "tb_flse_lim_stag";
+			String editPar = "tb_flse_lim_stag:修改值为" + editResInfoVO.getXqswObjQ().getTbFlseLimStag();
 			if (StringUtil.isNotBlank(editResInfoVO.getXqswObjQ().getTbFloodSeasonStart()))
-				editPar += ",tb_flood_season_start";
+				editPar += ",tb_flood_season_start:修改值为" + editResInfoVO.getXqswObjQ().getTbFloodSeasonStart();
 			if (StringUtil.isNotBlank(editResInfoVO.getXqswObjQ().getTbFloodSeasonEnd()))
-				editPar += ",tb_flood_season_end";
+				editPar += ",tb_flood_season_end:修改值为" + editResInfoVO.getXqswObjQ().getTbFloodSeasonEnd();
 			paramJson.put("editPar", editPar);
 			paramJson.put("ly", "ywxt");
 			paramJson.put("user_id", AuthUtil.getUserId());
@@ -84,11 +84,11 @@
 
 			JSONObject paramJson = new JSONObject();
 			paramJson.put("time", DateUtil.format(new Date(),"yyyy-MM-dd"));
-			String editPar = "tb_flse_lim_stag";
+			String editPar = "tb_flse_lim_stag:修改值为" + editResInfoVO.getXqswObjZ().getTbFlseLimStag();
 			if (StringUtil.isNotBlank(editResInfoVO.getXqswObjQ().getTbFloodSeasonStart()))
-				editPar += ",tb_flood_season_start";
+				editPar += ",tb_flood_season_start:修改值为" + editResInfoVO.getXqswObjQ().getTbFloodSeasonStart();
 			if (StringUtil.isNotBlank(editResInfoVO.getXqswObjQ().getTbFloodSeasonEnd()))
-				editPar += ",tb_flood_season_end";
+				editPar += ",tb_flood_season_end:修改值为" + editResInfoVO.getXqswObjQ().getTbFloodSeasonEnd();
 			paramJson.put("editPar", editPar);
 			paramJson.put("ly", "ywxt");
 			paramJson.put("user_id", AuthUtil.getUserId());
@@ -109,11 +109,11 @@
 
 			JSONObject paramJson = new JSONObject();
 			paramJson.put("time", DateUtil.format(new Date(),"yyyy-MM-dd"));
-			String editPar = "tb_flse_lim_stag";
+			String editPar = "tb_flse_lim_stag:修改值为" + editResInfoVO.getXqswObjH().getTbFlseLimStag();
 			if (StringUtil.isNotBlank(editResInfoVO.getXqswObjQ().getTbFloodSeasonStart()))
-				editPar += ",tb_flood_season_start";
+				editPar += ",tb_flood_season_start:修改值为" + editResInfoVO.getXqswObjQ().getTbFloodSeasonStart();
 			if (StringUtil.isNotBlank(editResInfoVO.getXqswObjQ().getTbFloodSeasonEnd()))
-				editPar += ",tb_flood_season_end";
+				editPar += ",tb_flood_season_end:修改值为" + editResInfoVO.getXqswObjQ().getTbFloodSeasonEnd();
 			paramJson.put("editPar", editPar);
 			paramJson.put("ly", "ywxt");
 			paramJson.put("user_id", AuthUtil.getUserId());
@@ -161,6 +161,12 @@
 			attResDangerManageSpecial.setResGuid(editResInfoVO.getResGuid());
 			attResDangerManageSpecial.setTbControlZ(editResInfoVO.getTbControlZ());
 			attResDangerManageSpecialService.updateAttResDangerManageSpecialByResId(attResDangerManageSpecial);
+		}else{
+			//如果控制运行水位为空,则置空
+			AttResDangerManageSpecial attResDangerManageSpecial = new AttResDangerManageSpecial();
+			attResDangerManageSpecial.setResGuid(editResInfoVO.getResGuid());
+			attResDangerManageSpecial.setTbControlZ("");
+			attResDangerManageSpecialService.updateAttResDangerManageSpecialByResId(attResDangerManageSpecial);
 		}
 
 		return attResStagCharService.customizeUpdateByGuid(attResStagChar);

--
Gitblit v1.9.3