From 821ca65b5facf2470306ca51cc5057d6417373e8 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 29 May 2023 11:59:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResFlseLimServiceImpl.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 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 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