From bbaaa7dda42c73311c2cd526f7d31fcf4988a61c Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 30 May 2023 15:05:49 +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/AttResStagCharServiceImpl.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResStagCharServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResStagCharServiceImpl.java
index 4fca095..a79d3d0 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResStagCharServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResStagCharServiceImpl.java
@@ -4,13 +4,18 @@
import cn.gistack.sm.sjztmd.mapper.AttResStagCharMapper;
import cn.gistack.sm.sjztmd.service.IAttResStagCharService;
import cn.gistack.system.user.feign.IUserClient;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.nacos.shaded.com.google.gson.JsonObject;
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;
import org.springframework.stereotype.Service;
+
+import java.util.Date;
/**
* @ClassName AttResStagCharServiceImpl
@@ -34,9 +39,30 @@
@Override
public Boolean customizeUpdateByGuid(AttResStagChar attResStagChar) {
attResStagChar.setUpdateTime(DateUtil.now());
-// attResStagChar.setUpdateUserCode(String.valueOf(AuthUtil.getUserId()));
- attResStagChar.setUpdateBy(AuthUtil.getUserName() + "-" + userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone());
-// attResStagChar.setUpdateUserPhone(userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone());
+ JSONObject paramJson = new JSONObject();
+ paramJson.put("time", DateUtil.format(new Date(),"yyyy-MM-dd"));
+ String editPar = "";
+ if (StringUtil.isNotBlank(attResStagChar.getTbChecFlStag()))
+ editPar += ",tb_chec_fl_stag";
+ if (StringUtil.isNotBlank(attResStagChar.getTbDeadStag()))
+ editPar += ",tb_dead_stag";
+ if (StringUtil.isNotBlank(attResStagChar.getTbDesFlStag()))
+ editPar += ",tb_des_fl_stag";
+ if (StringUtil.isNotBlank(attResStagChar.getTbFlprHighStag()))
+ editPar += ",tb_flpr_high_stag";
+ if (StringUtil.isNotBlank(attResStagChar.getTbNormPoolStag()))
+ editPar += ",tb_norm_pool_stag";
+ if (StringUtil.isNotBlank(attResStagChar.getTbDeadCap()))
+ editPar += ",tb_dead_cap";
+ if (StringUtil.isNotBlank(attResStagChar.getTbTotCap()))
+ editPar += ",tb_tot_cap";
+ 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());
+
+ attResStagChar.setUpdateBy(paramJson.toJSONString());
return SqlHelper.retBool(baseMapper.customizeUpdateByGuid(attResStagChar));
}
}
--
Gitblit v1.9.3