diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java index a2793ca..81c1036 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java @@ -57,6 +57,7 @@ import java.io.InputStream; import java.math.BigDecimal; import java.math.BigInteger; import java.math.RoundingMode; +import java.rmi.ServerException; import java.text.SimpleDateFormat; import java.time.LocalDate; import java.time.ZoneId; @@ -1683,8 +1684,31 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(HuzhouPlaninfo::getProjectId,projectid) .last("LIMIT 1"); @@ -1720,12 +1744,20 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.eq(HuzhouPlaninfo::getProjectId,projectid) + LambdaUpdateWrapper updateWrapper1 = new LambdaUpdateWrapper<>(); + updateWrapper1.eq(HuzhouPlaninfo::getProjectId,projectid) .set(HuzhouPlaninfo::getGroupId,groupId) .set(HuzhouPlaninfo::getIsfinish, "0"); - planInfoMapper.update(null, updateWrapper); - // 5. 更新子项目计划更新标志, + planInfoMapper.update(null, updateWrapper1); + + // 立项阶段默认完成 +// LambdaUpdateWrapper updateWrapper2 = new LambdaUpdateWrapper<>(); +// updateWrapper2.eq(HuzhouPlaninfo::getProjectId, projectid) +// .likeRight(HuzhouPlaninfo::getTaskLevel, "1") +// .set(HuzhouPlaninfo::getIsfinish, "2"); +// planInfoMapper.update(null, updateWrapper2); + + // TODO 5. 更新子项目计划更新标志 // LambdaUpdateWrapper subUpdateWrapper = new LambdaUpdateWrapper<>(); // subUpdateWrapper.eq(HuzhouSubProjectinfo::getId, projectid); // subUpdateWrapper.set(HuzhouSubProjectinfo::getUpdatePlanFlag, "2"); diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java index b4e7ac0..e96287b 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java @@ -3,6 +3,7 @@ package com.easy.admin.modules.huzhou.service.impl; import cn.afterturn.easypoi.excel.ExcelImportUtil; import cn.afterturn.easypoi.excel.entity.ImportParams; import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -462,12 +463,15 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(HuzhouPlaninfo::getProjectId,projectId); List planInfoList = planinfoMapper.selectList(queryWrapper); + if (CollectionUtil.isNotEmpty(planInfoList)){ + // 判断是否所有 isfinish 都等于 "2" + boolean allFinished = planInfoList.stream() + .allMatch(plan -> "2".equals(plan.getIsfinish())); + record.setIsArchive(allFinished); + }else { + record.setIsArchive(false); + } - // 判断是否所有 isfinish 都等于 "2" - boolean allFinished = planInfoList.stream() - .allMatch(plan -> "2".equals(plan.getIsfinish())); - - record.setIsArchive(allFinished); } return projectAndChildInfoPageList; } diff --git a/huzhou/src/main/resources/excelTemplate/项目计划模板.xlsx b/huzhou/src/main/resources/excelTemplate/项目计划模板.xlsx index 3431985..1c81fa2 100644 Binary files a/huzhou/src/main/resources/excelTemplate/项目计划模板.xlsx and b/huzhou/src/main/resources/excelTemplate/项目计划模板.xlsx differ