From 1eac2dc68522014dead629c273c4cd6d1e1846c4 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Tue, 12 Nov 2024 10:43:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E6=8E=A5=E5=8F=A3=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/purchase/domain/dto/PurchaseQueryDto.java | 4 ++-- .../service/impl/PurchaseCheckInfoServiceImpl.java | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) 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 9f1af58c..b4104621 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 @@ -37,8 +37,8 @@ public class PurchaseQueryDto { @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date endTime; - @ApiModelProperty(value = "任务状态") - private Integer taskStatus; +// @ApiModelProperty(value = "外层任务状态") +// private Integer taskStatus; @ApiModelProperty(value = "关键字") private String keyWord; 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 d5a427cc..75e60c54 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 @@ -76,7 +76,7 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { if (isAllowPartTransfer) { purchaseCheckDetails = purchaseCheckDetailsMapper.selectPurchaseCheckDetailsListByQueryDto(purchaseQueryDto); } else { - purchaseQueryDto.setTaskStatus(null); + purchaseQueryDto.setStatusList(null); purchaseCheckDetails = purchaseCheckDetailsMapper.selectPurchaseCheckDetailsListByQueryDto(purchaseQueryDto); } purchaseCheckDtoResult.setPurchaseCheckDetailsList(purchaseCheckDetails); @@ -98,8 +98,6 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { return purchaseCheckInfoResult; } boolean isAllowPartTransfer = bmConfigService.isBmConfigEnabledWithDefaultFalse(BmConfigItems.BOOLEAN_ALLOW_PURCHASE_PART_TRANSFER); - // TODO 下一行需要前端传1后删除 - // purchaseQueryDto.setTaskStatus(Objects.isNull(purchaseQueryDto.getTaskStatus()) ? PurchaseTaskStatusEnum.TO_NOTICE.getStatus() : purchaseQueryDto.getTaskStatus()); for (PurchaseCheckInfo purchaseInfo : purchaseCheckInfos) { List purchaseCheckDetails = purchaseCheckDetailsMapper.selectPurchaseCheckDetailsListByTaskId(purchaseInfo.getTaskId(), null); OptionalInt minStatus = purchaseCheckDetails.stream().mapToInt(PurchaseCheckDetails::getStatus).min(); @@ -136,10 +134,11 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { } else { purchaseInfo.setTaskStatus(PurchaseTaskStatusEnum.TASK_IN_PROGRESS.getStatus()); //外层任务进行中 } + // 设置外层任务列表 if (isAllowPartTransfer) { purchaseCheckInfoResult.add(purchaseInfo); - } else if (minStatus.isPresent() && Integer.valueOf(minStatus.getAsInt()).equals(purchaseQueryDto.getTaskStatus())) { - // 当不允许部分物资状态流转时，例如内部状态含(2,3)，其中最小的状态值(2),当等于传入的状态值(2)时，才显示外面的列表 + } else if (minStatus.isPresent() && purchaseQueryDto.getStatusList().contains(Integer.valueOf(minStatus.getAsInt()))) { + // 当不允许部分物资状态流转时，例如内部状态含(2,12,3,13)，其中最小的状态值(2),当等于传入的状态值(2,12)时，才显示外面的列表 purchaseCheckInfoResult.add(purchaseInfo); } }