toolchaintechnologycenter/spdm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、需求查询 bugfix

Browse Source
This commit is contained in:
lidongyang
2025-12-25 09:16:11 +08:00
parent e84cfd997d
commit 2ef581e5f7
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
project/src/main/java/com/sdm/project/common/TaskExeStatusEnum.java
View File

@@ -5,6 +5,7 @@ import lombok.Getter;
@Getter
public enum TaskExeStatusEnum {
NO_CONFIRM("未确认", "0"),
NO_STARTED("未开始", "1"),
IN_PROGRESS("进行中", "2"),
REJECTED("已驳回", "3"),

8
project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java
View File

@@ -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 {