diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseBindController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseBindController.java index b12cc378..eac40258 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseBindController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseBindController.java @@ -74,6 +74,6 @@ public class PurchaseBindController extends BaseController { @RequiresPermissions("purchase:bind:query") @GetMapping(value = "/getById") public AjaxResult getInfo(PurchaseDto dto) { - return AjaxResult.success(purchaseBindService.selectPurchaseCheckInfoById(dto)); + return purchaseBindService.selectPurchaseCheckInfoById(dto); } } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseBindService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseBindService.java index f77758d1..bbf32b58 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseBindService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseBindService.java @@ -24,7 +24,7 @@ public interface IPurchaseBindService { * @param dto * @return */ - List selectPurchaseCheckInfoById(PurchaseDto dto); + AjaxResult selectPurchaseCheckInfoById(PurchaseDto dto); /** * 获取新购绑定二级明细列表 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseBindServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseBindServiceImpl.java index 8658f7ab..3c640cfd 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseBindServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseBindServiceImpl.java @@ -63,8 +63,11 @@ public class PurchaseBindServiceImpl implements IPurchaseBindService { * @return */ @Override - public List selectPurchaseCheckInfoById(PurchaseDto dto) { - return purchaseBindMapper.selectPurchaseCheckInfoById(dto); + public AjaxResult selectPurchaseCheckInfoById(PurchaseDto dto) { + if (dto == null || dto.getTaskId() == null || dto.getTypeId() == null) { + return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), "参数不能为空"); + } + return AjaxResult.success(purchaseBindMapper.selectPurchaseCheckInfoById(dto)); } /** diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseStorageServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseStorageServiceImpl.java index 895028d3..df4715dc 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseStorageServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseStorageServiceImpl.java @@ -76,7 +76,7 @@ public class PurchaseStorageServiceImpl implements IPurchaseStorageService { */ @Override public AjaxResult warehouse(PurchaseDto dto) { - if (dto.getId() != null) { + if (dto.getTaskId() != null) { //外层入库 return processByTaskIds(dto); } else if (dto.getPurchaseId() != null) { @@ -93,7 +93,7 @@ public class PurchaseStorageServiceImpl implements IPurchaseStorageService { */ @Override public AjaxResult reject(PurchaseDto dto) { - if (dto.getId() != null) { + if (dto.getTaskId() != null) { //外层驳回 return rejectByTaskIds(dto); } else if (dto.getPurchaseId() != null) { @@ -115,7 +115,7 @@ public class PurchaseStorageServiceImpl implements IPurchaseStorageService { List details = purchaseStorageMapper.getDetails(purchaseDto); if (CollectionUtils.isNotEmpty(details)) { result += updateRejectAndStatus(Integer.parseInt(purchaseDto.getPurchaseId())); - List statusList = purchaseStorageMapper.select(details.get(0).getId().toString()); + List statusList = purchaseStorageMapper.select(details.get(0).getTaskId().toString()); result += updateTaskStatus(statusList); } if (result > 0) { @@ -142,11 +142,11 @@ public class PurchaseStorageServiceImpl implements IPurchaseStorageService { * @return */ private AjaxResult rejectByTaskIds(PurchaseDto dto) { - List taskIdList = parseIds(dto.getId()); + List taskIdList = parseIds(dto.getTaskId()); int result = 0; try { for (Integer taskId : taskIdList) { - dto.setId(String.valueOf(taskId)); + dto.setTaskId(String.valueOf(taskId)); List details; details = purchaseStorageMapper.getDetails(dto); for (PurchaseVo purchaseVo : details) { @@ -176,7 +176,7 @@ public class PurchaseStorageServiceImpl implements IPurchaseStorageService { List details = purchaseStorageMapper.getDetails(purchaseDto); if (CollectionUtils.isNotEmpty(details)) { result += updatePurchaseInfoAndDetails(details.get(0), Integer.parseInt(purchaseDto.getPurchaseId())); - List statusList = purchaseStorageMapper.select(details.get(0).getId().toString()); + List statusList = purchaseStorageMapper.select(details.get(0).getTaskId().toString()); result += updateTaskStatus(statusList); } if (result > 0) { @@ -210,11 +210,11 @@ public class PurchaseStorageServiceImpl implements IPurchaseStorageService { * @return */ private AjaxResult processByTaskIds(PurchaseDto dto) { - List taskIdList = parseIds(dto.getId()); + List taskIdList = parseIds(dto.getTaskId()); int result = 0; try { for (Integer taskId : taskIdList) { - dto.setId(String.valueOf(taskId)); + dto.setTaskId(String.valueOf(taskId)); List details; details = purchaseStorageMapper.getDetails(dto); result += updateDetailsAndStatus(details); @@ -257,7 +257,7 @@ public class PurchaseStorageServiceImpl implements IPurchaseStorageService { private int updateTaskStatus(List details) { Map> groupedByIdStatus = details.stream() .collect(Collectors.groupingBy( - PurchaseVo::getId, + PurchaseVo::getTaskId, Collectors.mapping(PurchaseVo::getStatus, Collectors.toList()) ));