bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新购接口优化

This commit is contained in:
sxu 2024-11-12 10:43:59 +08:00
parent 413d8a0e89
commit 1eac2dc685
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseQueryDto.java
View File

@ -37,8 +37,8 @@ public class PurchaseQueryDto {
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date endTime; private Date endTime;
@ApiModelProperty(value = "任务状态") // @ApiModelProperty(value = "外层任务状态")
private Integer taskStatus; // private Integer taskStatus;
@ApiModelProperty(value = "关键字") @ApiModelProperty(value = "关键字")
private String keyWord; private String keyWord;

9
bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java
View File

@ -76,7 +76,7 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService {
if (isAllowPartTransfer) { if (isAllowPartTransfer) {
purchaseCheckDetails = purchaseCheckDetailsMapper.selectPurchaseCheckDetailsListByQueryDto(purchaseQueryDto); purchaseCheckDetails = purchaseCheckDetailsMapper.selectPurchaseCheckDetailsListByQueryDto(purchaseQueryDto);
} else { } else {
purchaseQueryDto.setTaskStatus(null); purchaseQueryDto.setStatusList(null);
purchaseCheckDetails = purchaseCheckDetailsMapper.selectPurchaseCheckDetailsListByQueryDto(purchaseQueryDto); purchaseCheckDetails = purchaseCheckDetailsMapper.selectPurchaseCheckDetailsListByQueryDto(purchaseQueryDto);
} }
purchaseCheckDtoResult.setPurchaseCheckDetailsList(purchaseCheckDetails); purchaseCheckDtoResult.setPurchaseCheckDetailsList(purchaseCheckDetails);
@ -98,8 +98,6 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService {
return purchaseCheckInfoResult; return purchaseCheckInfoResult;
} }
boolean isAllowPartTransfer = bmConfigService.isBmConfigEnabledWithDefaultFalse(BmConfigItems.BOOLEAN_ALLOW_PURCHASE_PART_TRANSFER); 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) { for (PurchaseCheckInfo purchaseInfo : purchaseCheckInfos) {
List<PurchaseCheckDetails> purchaseCheckDetails = purchaseCheckDetailsMapper.selectPurchaseCheckDetailsListByTaskId(purchaseInfo.getTaskId(), null); List<PurchaseCheckDetails> purchaseCheckDetails = purchaseCheckDetailsMapper.selectPurchaseCheckDetailsListByTaskId(purchaseInfo.getTaskId(), null);
OptionalInt minStatus = purchaseCheckDetails.stream().mapToInt(PurchaseCheckDetails::getStatus).min(); OptionalInt minStatus = purchaseCheckDetails.stream().mapToInt(PurchaseCheckDetails::getStatus).min();
@ -136,10 +134,11 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService {
} else { } else {
purchaseInfo.setTaskStatus(PurchaseTaskStatusEnum.TASK_IN_PROGRESS.getStatus()); //外层任务进行中 purchaseInfo.setTaskStatus(PurchaseTaskStatusEnum.TASK_IN_PROGRESS.getStatus()); //外层任务进行中
} }
// 设置外层任务列表
if (isAllowPartTransfer) { if (isAllowPartTransfer) {
purchaseCheckInfoResult.add(purchaseInfo); purchaseCheckInfoResult.add(purchaseInfo);
} else if (minStatus.isPresent() && Integer.valueOf(minStatus.getAsInt()).equals(purchaseQueryDto.getTaskStatus())) { } else if (minStatus.isPresent() && purchaseQueryDto.getStatusList().contains(Integer.valueOf(minStatus.getAsInt()))) {
// 当不允许部分物资状态流转时，例如内部状态含(2,3)，其中最小的状态值(2),当等于传入的状态值(2)时，才显示外面的列表 // 当不允许部分物资状态流转时，例如内部状态含(2,12,3,13)，其中最小的状态值(2),当等于传入的状态值(2,12)时，才显示外面的列表
purchaseCheckInfoResult.add(purchaseInfo); purchaseCheckInfoResult.add(purchaseInfo);
} }
} }