From 43b7de6fb144831d8e3094338cd9b0b413610976 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Mon, 29 May 2023 21:04:10 +0800
Subject: [PATCH] 责任人批量填报updateBy内容补充

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResFlseLimServiceImpl.java |   51 ++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 48 insertions(+), 3 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 7b7edd4..72083ac 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
@@ -10,6 +10,7 @@
 import cn.gistack.sm.sjztmd.service.IAttResWaterBlockService;
 import cn.gistack.sm.sjztmd.vo.EditResInfoVO;
 import cn.gistack.system.user.feign.IUserClient;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
@@ -19,6 +20,8 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
 
 /**
  * @PROJECT_NAME: skjcmanager
@@ -49,21 +52,63 @@
 			AttResFlseLim attResFlseLimQ = editResInfoVO.getXqswObjQ();
 			attResFlseLimQ.setResGuid(editResInfoVO.getResGuid());
 			attResFlseLimQ.setUpdateTime(DateUtil.now());
-			attResFlseLimQ.setUpdateBy(AuthUtil.getUserName() + "-" + userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone());
+
+			JSONObject paramJson = new JSONObject();
+			paramJson.put("time", DateUtil.format(new Date(),"yyyy-MM-dd"));
+			String editPar = "tb_flse_lim_stag";
+			if (StringUtil.isNotBlank(editResInfoVO.getXqswObjQ().getTbFloodSeasonStart()))
+				editPar += ",tb_flood_season_start";
+			if (StringUtil.isNotBlank(editResInfoVO.getXqswObjQ().getTbFloodSeasonEnd()))
+				editPar += ",tb_flood_season_end";
+			paramJson.put("editPar", editPar);
+			paramJson.put("ly", "ywxt");
+			paramJson.put("user_id", AuthUtil.getUserId());
+			paramJson.put("user_name", AuthUtil.getUserName());
+			paramJson.put("phone", userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone());
+			attResFlseLimQ.setUpdateBy(paramJson.toJSONString());
+
 			baseMapper.updateAttResFlseLimByGuid(attResFlseLimQ,"前汛期");
 		}
 		if (null != editResInfoVO.getXqswObjZ()) {
 			AttResFlseLim attResFlseLimZ = editResInfoVO.getXqswObjZ();
 			attResFlseLimZ.setResGuid(editResInfoVO.getResGuid());
 			attResFlseLimZ.setUpdateTime(DateUtil.now());
-			attResFlseLimZ.setUpdateBy(AuthUtil.getUserName() + "-" + userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone());
+
+			JSONObject paramJson = new JSONObject();
+			paramJson.put("time", DateUtil.format(new Date(),"yyyy-MM-dd"));
+			String editPar = "tb_flse_lim_stag";
+			if (StringUtil.isNotBlank(editResInfoVO.getXqswObjQ().getTbFloodSeasonStart()))
+				editPar += ",tb_flood_season_start";
+			if (StringUtil.isNotBlank(editResInfoVO.getXqswObjQ().getTbFloodSeasonEnd()))
+				editPar += ",tb_flood_season_end";
+			paramJson.put("editPar", editPar);
+			paramJson.put("ly", "ywxt");
+			paramJson.put("user_id", AuthUtil.getUserId());
+			paramJson.put("user_name", AuthUtil.getUserName());
+			paramJson.put("phone", userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone());
+			attResFlseLimZ.setUpdateBy(paramJson.toJSONString());
+
 			baseMapper.updateAttResFlseLimByGuid(attResFlseLimZ,"中汛期");
 		}
 		if (null != editResInfoVO.getXqswObjH()) {
 			AttResFlseLim attResFlseLimH = editResInfoVO.getXqswObjH();
 			attResFlseLimH.setResGuid(editResInfoVO.getResGuid());
 			attResFlseLimH.setUpdateTime(DateUtil.now());
-			attResFlseLimH.setUpdateBy(AuthUtil.getUserName() + "-" + userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone());
+
+			JSONObject paramJson = new JSONObject();
+			paramJson.put("time", DateUtil.format(new Date(),"yyyy-MM-dd"));
+			String editPar = "tb_flse_lim_stag";
+			if (StringUtil.isNotBlank(editResInfoVO.getXqswObjQ().getTbFloodSeasonStart()))
+				editPar += ",tb_flood_season_start";
+			if (StringUtil.isNotBlank(editResInfoVO.getXqswObjQ().getTbFloodSeasonEnd()))
+				editPar += ",tb_flood_season_end";
+			paramJson.put("editPar", editPar);
+			paramJson.put("ly", "ywxt");
+			paramJson.put("user_id", AuthUtil.getUserId());
+			paramJson.put("user_name", AuthUtil.getUserName());
+			paramJson.put("phone", userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone());
+			attResFlseLimH.setUpdateBy(paramJson.toJSONString());
+
 			baseMapper.updateAttResFlseLimByGuid(attResFlseLimH,"后汛期");
 		}
 

--
Gitblit v1.9.3