From 6fe995e8d8cb51fe21e3c40a1394af6e1d1ce614 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Mon, 18 Nov 2024 15:31:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E6=A8=A1=E5=9D=97=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PurchaseCheckInfoServiceImpl.java | 8 ++++---- .../main/resources/mapper/material/task/TmTaskMapper.xml | 2 +- 2 files changed, 5 insertions(+), 5 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 2ef4b115..77bbeb27 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 @@ -272,7 +272,6 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { updateCount += purchaseCheckDetailsMapper.updatePurchaseDetails4Check(details); } } - // 注意: 维护tm_task的状态,但因为新购任务中的物资可以部分流转,所以汇总的状态失去意义,不再维护 } return updateCount > 0 ? AjaxResult.success("验证成功") : AjaxResult.error("无验证信息"); } catch (Exception e) { @@ -286,8 +285,6 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { try { AjaxResult result = new AjaxResult(); if (!CollectionUtils.isEmpty(purchaseVerifyVo.getPurchaseCheckDetailsList())) { - //Long taskId = purchaseVerifyVo.getPurchaseCheckDetailsList().get(0).getTaskId(); - //Integer status = purchaseCheckDetailsList.get(0).getStatus(); if (BooleanUtils.isTrue(purchaseVerifyVo.getVerifyPass())) { for (PurchaseCheckDetails details : purchaseVerifyVo.getPurchaseCheckDetailsList()) { if (MaTypeManageTypeEnum.CODE_DEVICE.getTypeId().equals(details.getManageType())) { @@ -301,9 +298,12 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { for (PurchaseCheckDetails details : purchaseVerifyVo.getPurchaseCheckDetailsList()) { details.setStatus(PurchaseTaskStatusEnum.TO_NOTICE.getStatus()); result = purchaseCheckDetailsMapper.updatePurchaseDetails4Check(details) > 0 ? AjaxResult.success("detail验证驳回成功") : AjaxResult.error("details无验证信息"); + tmTaskMapper.updateTmTask(new TmTask() + .setTaskId(details.getTaskId()) + .setTaskType(TmTaskTypeEnum.TM_TASK_PURCHASE.getTaskTypeId()) + .setTaskStatus(PurchaseTaskStatusEnum.TASK_TO_START.getStatus())); } } - // 注意: 维护tm_task的状态,但因为新购任务中的物资可以部分流转,所以汇总的状态失去意义,不再维护 } return result; } catch (Exception e) { diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskMapper.xml index 85b57af1..ca60d937 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskMapper.xml @@ -78,9 +78,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_by = #{createBy}, create_time = #{createTime}, update_by = #{updateBy}, - update_time = #{updateTime}, remark = #{remark}, company_id = #{companyId}, + update_time = NOW() where task_id = #{taskId}