From f2d0713c2b20a6c751399e2468996eafb8812988 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Thu, 18 Apr 2024 10:37:13 +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/TbProjectServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbProjectServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbProjectServiceImpl.java
index d6ea93d..adf41fa 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbProjectServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbProjectServiceImpl.java
@@ -10,6 +10,7 @@
import cn.gistack.sm.sjztmd.service.ITbProjectScheduleService;
import cn.gistack.sm.sjztmd.service.ITbProjectService;
import cn.gistack.sm.sjztmd.statisticsVO.StatisticsParams;
+import cn.gistack.sm.sjztmd.statisticsVO.StatisticsTable;
import cn.gistack.sm.sjztmd.statisticsVO.StatisticsTableProject;
import cn.gistack.sm.sjztmd.util.CalculateUtils;
import cn.gistack.sm.sjztmd.vo.TbProjectVO;
@@ -61,12 +62,12 @@
if (tbProjectScheduleList != null && tbProjectScheduleList.size()>0){
tbProjectScheduleList.forEach(tbProjectSchedule -> {
tbProjectSchedule.setTbProjectId(tbProjectDTO.getGuid());
- tbProjectDTO.setUpdateUser(AuthUtil.getUserId().toString());
- tbProjectDTO.setUpdateTime(DateUtil.now());
+ tbProjectSchedule.setUpdateUser(AuthUtil.getUserId().toString());
+ tbProjectSchedule.setUpdateTime(DateUtil.now());
- if (StringUtil.isBlank(tbProjectDTO.getGuid())){
- tbProjectDTO.setCreateUser(AuthUtil.getUserId().toString());
- tbProjectDTO.setCreateTime(DateUtil.now());
+ if (StringUtil.isBlank(tbProjectSchedule.getGuid())){
+ tbProjectSchedule.setCreateUser(AuthUtil.getUserId().toString());
+ tbProjectSchedule.setCreateTime(DateUtil.now());
}
tbProjectScheduleService.saveOrUpdate(tbProjectSchedule);
});
--
Gitblit v1.9.3