From 6a90f576b12953a8106d3925e3b07da422059c14 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Fri, 15 Nov 2024 11:01:01 +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 --- .../impl/PurchaseCheckInfoServiceImpl.java | 33 ++++++++++++++----- 1 file changed, 24 insertions(+), 9 deletions(-) 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 41a56860..b0d53176 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 @@ -240,15 +240,27 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { AjaxResult result = new AjaxResult(); purchaseDto.getTaskIds().removeIf(Objects::isNull); for (Long taskId : purchaseDto.getTaskIds()) { - boolean updateResult = tmTaskMapper.updateTmTaskStatusByTaskId(taskId, - purchaseDto.getStatus() - ) > 0; - if (updateResult) { - result = purchaseCheckDetailsMapper.batchUpdateDetailsTaskStatus(taskId, - purchaseDto.getStatus(), purchaseDto.getCheckResult() - ) > 0 ? AjaxResult.success("验收状态更改成功") : AjaxResult.error("验收状态更改失败"); - } else { - result = AjaxResult.error("SQL未报错，但修改任务0条"); + PurchaseQueryDto purchaseQueryDto = new PurchaseQueryDto(); + purchaseQueryDto.setTaskId(purchaseQueryDto.getTaskId()); + List purchaseCheckDetails = purchaseCheckDetailsMapper.selectPurchaseCheckDetailsListByQueryDto(purchaseQueryDto); + List codeList = purchaseCheckDetails.stream().filter(o -> MaTypeManageTypeEnum.CODE_DEVICE.equals(o.getManageType())).collect(Collectors.toList()); + List numList = purchaseCheckDetails.stream().filter(o -> MaTypeManageTypeEnum.NUMBER_DEVICE.equals(o.getManageType())).collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(numList) && numList.size() > 0) { + for (PurchaseCheckDetails details : numList) { + details.setStatus(PurchaseTaskStatusEnum.TO_STORE.getStatus()); + purchaseCheckDetailsMapper.updatePurchaseDetails(details); + } + } + if (!CollectionUtils.isEmpty(codeList) && codeList.size() > 0) { + for (PurchaseCheckDetails details : codeList) { + details.setStatus(PurchaseTaskStatusEnum.TO_CHECK.getStatus()); + purchaseCheckDetailsMapper.updatePurchaseDetails(details); + } + int taskCount = tmTaskMapper.updateTmTaskStatusByTaskId(taskId, PurchaseTaskStatusEnum.TO_CHECK.getStatus()); + result = taskCount > 0 ? AjaxResult.success("验收状态更改成功") : AjaxResult.error("验收状态更改失败"); + } if (!CollectionUtils.isEmpty(numList) && numList.size() > 0) { + int taskCount = tmTaskMapper.updateTmTaskStatusByTaskId(taskId, PurchaseTaskStatusEnum.TO_STORE.getStatus()); + result = taskCount > 0 ? AjaxResult.success("待入库状态更改成功") : AjaxResult.error("待入库状态更改失败"); } } return result; @@ -266,6 +278,9 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { Long taskId = purchaseCheckDetailsList.get(0).getTaskId(); Integer status = purchaseCheckDetailsList.get(0).getStatus(); for (PurchaseCheckDetails details : purchaseCheckDetailsList) { + if (MaTypeManageTypeEnum.NUMBER_DEVICE.getTypeId().equals(details.getManageType())) { + details.setStatus(PurchaseTaskStatusEnum.TO_STORE.getStatus()); + } result = purchaseCheckDetailsMapper.updatePurchaseDetails(details) > 0 ? AjaxResult.success("details验收状态更改成功") : AjaxResult.error("details验收状态更改失败"); } //查询是否这个taskId是否已全部验收通过，如果是的，更新整个task的任务状态