From e986d4f68bea04a82dfcbfa1d65f62720c928864 Mon Sep 17 00:00:00 2001
From: yxm <zhp1521624>
Date: Fri, 28 Jun 2024 11:49:08 +0800
Subject: [PATCH] 项目管理校验状态优化v20240628
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbProjectServiceImpl.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 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..eb66de5 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;
@@ -22,7 +23,6 @@
import org.springblade.core.tool.utils.StringUtil;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-
import java.math.BigDecimal;
import java.util.Arrays;
import java.util.List;
@@ -52,6 +52,11 @@
tbProjectDTO.setUpdateUser(AuthUtil.getUserId().toString());
tbProjectDTO.setUpdateTime(DateUtil.now());
+ if(tbProjectDTO.getIsFill().equals("0")){
+ tbProjectDTO.setCheckState("0");
+ }else if(tbProjectDTO.getIsFill().equals("1")){
+ tbProjectDTO.setCheckState("1");
+ }
//更新项目表
boolean update = updateById(tbProjectDTO);
@@ -61,12 +66,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);
});
@@ -127,7 +132,7 @@
tbProject.setUpdateTime(DateUtil.now());
updateById(tbProject);
- }else {
+ } else {
//无数据，新增
TbProject save = new TbProject();
save.setUpdateUser(AuthUtil.getUserId().toString());
@@ -150,4 +155,14 @@
}
});
}
+
+ @Override
+ public boolean updatecheckState(String id,String checkState) {
+ TbProject tbProject = getById(id);
+ if(checkState.equals("0")){
+ tbProject.setIsFill(checkState);
+ }
+ tbProject.setCheckState(checkState);
+ return saveOrUpdate(tbProject);
+ }
}
--
Gitblit v1.9.3