diff --git a/project/src/main/java/com/sdm/project/common/TaskExeStatusEnum.java b/project/src/main/java/com/sdm/project/common/TaskExeStatusEnum.java index c6d90052..492bffc8 100644 --- a/project/src/main/java/com/sdm/project/common/TaskExeStatusEnum.java +++ b/project/src/main/java/com/sdm/project/common/TaskExeStatusEnum.java @@ -5,6 +5,7 @@ import lombok.Getter; @Getter public enum TaskExeStatusEnum { + NO_CONFIRM("未确认", "0"), NO_STARTED("未开始", "1"), IN_PROGRESS("进行中", "2"), REJECTED("已驳回", "3"), diff --git a/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java index 35475877..96238640 100644 --- a/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java @@ -380,7 +380,9 @@ public class DemandServiceImpl extends BaseService implements IDemandService { eachTaskList = taskMap.get(demand.getUuid()); if (CollectionUtils.isEmpty(eachTaskList)) { log.info("当前需求:{}没有关联的任务", demand.getId()); - newDemandList.add(demand); + if (req.getAchieveStatus().equals(demand.getAchieveStatus())) { + newDemandList.add(demand); + } } else { if (eachTaskList.stream().map(SpdmTaskVo::getAchieveStatus).toList().contains(TaskAchieveStatusEnum.UNQUALIFIED.getCode())) { eachStatus = TaskAchieveStatusEnum.UNQUALIFIED.getCode(); @@ -416,7 +418,9 @@ public class DemandServiceImpl extends BaseService implements IDemandService { eachTaskList = taskMap.get(demand.getUuid()); if (CollectionUtils.isEmpty(eachTaskList)) { log.info("当前需求:{}没有关联的任务", demand.getId()); - newDemandList.add(demand); + if (req.getDemandStatus().equals(demand.getDemandStatus())) { + newDemandList.add(demand); + } } else {