From 65edb8fdfce98c62c357fc51dc5ec7119e8b5e8e Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Mon, 29 May 2023 11:06:35 +0800
Subject: [PATCH] 汛期水位修改增加修改人字段

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResFlseLim.java                  |    7 +++++++
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResFlseLimServiceImpl.java |   11 +++++++++++
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResFlseLimMapper.xml             |    1 +
 3 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResFlseLim.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResFlseLim.java
index c2c1e2b..cd3447f 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResFlseLim.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResFlseLim.java
@@ -52,6 +52,13 @@
 	private String tbFloodSeasonEnd;
 
 	/**
+	 * 更新人
+	 */
+	@ApiModelProperty(value = "更新人 ")
+	@TableField("\"update_by\"")
+	private String updateBy;
+
+	/**
 	 * 更新时间
 	 */
 	@ApiModelProperty(value = "更新时间 ")
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResFlseLimMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResFlseLimMapper.xml
index 38223d7..32a0ddc 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResFlseLimMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResFlseLimMapper.xml
@@ -13,6 +13,7 @@
         <if test="attResFlseLim.tbFloodSeasonEnd !=null and attResFlseLim.tbFloodSeasonEnd != ''">
             "tb_flood_season_end" = #{attResFlseLim.tbFloodSeasonEnd},
         </if>
+        "update_by" = #{attResFlseLim.updateBy},
         "update_time" = #{attResFlseLim.updateTime}
         WHERE "res_guid" = #{attResFlseLim.resGuid} and "flood_season_name" = #{type}
     </update>
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 8e0045d..7b7edd4 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
@@ -9,9 +9,11 @@
 import cn.gistack.sm.sjztmd.service.IAttResStagCharService;
 import cn.gistack.sm.sjztmd.service.IAttResWaterBlockService;
 import cn.gistack.sm.sjztmd.vo.EditResInfoVO;
+import cn.gistack.system.user.feign.IUserClient;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +36,9 @@
 	@Autowired
 	private IAttResWaterBlockService attResWaterBlockService;
 
+	@Autowired
+	private IUserClient userClient;
+
 	@Override
 	@Transactional
 	public Boolean updateAttResFlseLimByGuid(EditResInfoVO editResInfoVO) {
@@ -43,16 +48,22 @@
 		if (null != editResInfoVO.getXqswObjQ()) {
 			AttResFlseLim attResFlseLimQ = editResInfoVO.getXqswObjQ();
 			attResFlseLimQ.setResGuid(editResInfoVO.getResGuid());
+			attResFlseLimQ.setUpdateTime(DateUtil.now());
+			attResFlseLimQ.setUpdateBy(AuthUtil.getUserName() + "-" + userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone());
 			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());
 			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());
 			baseMapper.updateAttResFlseLimByGuid(attResFlseLimH,"后汛期");
 		}
 

--
Gitblit v1.9.3