diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/PurchaseTaskStatusEnum.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/PurchaseTaskStatusEnum.java index 1e6d4ecb..edc094f2 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/PurchaseTaskStatusEnum.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/PurchaseTaskStatusEnum.java @@ -44,10 +44,10 @@ public enum PurchaseTaskStatusEnum { } if (findEnum == null || stageEnum == null) { - return false; + return true; } else { - // 如果是最后的入库完成,那么说明流程已走完,不需要再判断了 - if (Objects.equals(findEnum.getStage(), TASK_FINISHED.getStage())) { + // 如果是最后的入库完成状态,那么说明流程已走完,不需要再对比状态了 + if (Objects.equals(findEnum.getStatus(), TASK_FINISHED.getStatus()) || Objects.equals(findEnum.getStatus(), IN_STORE.getStatus())) { return false; } return findEnum.getStage().equals(stageEnum.getCode()); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseQueryDto.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseQueryDto.java index 4637fdb7..62b2ebee 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseQueryDto.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseQueryDto.java @@ -35,6 +35,9 @@ public class PurchaseQueryDto { @ApiModelProperty(value = "任务阶段,对应新购阶段枚举") private Integer taskStage; + @ApiModelProperty(value = "是否完成") + private Integer isFinish; + @ApiModelProperty(value = "开始时间") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date startTime; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java index c4de9f2a..6bcaa0ca 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java @@ -229,6 +229,13 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { // 设置外层任务状态:入库待开始、入库进行中、入库已完成 TmTask tmTask = tmTaskMapper.selectTmTaskByTaskId(purchaseInfo.getTaskId()); purchaseInfo.setTaskStatusName(isIncludeStage ? "未完成" : "已完成"); + if (purchaseQueryDto.getIsFinish() != null) { + if (purchaseQueryDto.getIsFinish() == 1) { + if (isIncludeStage) {continue;} + } else { + if (!isIncludeStage) {continue;} + } + } purchaseInfo.setTaskStatus(tmTask.getTaskStatus()); // 设置外层任务列表 diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/WorkSiteDirectManageMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/WorkSiteDirectManageMapper.xml index ffeec4d2..043bfe32 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/WorkSiteDirectManageMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/WorkSiteDirectManageMapper.xml @@ -436,6 +436,7 @@ and dai.status = #{status} + order by dai.create_time desc