From ee9155b38679cc053be27ec53e23a530b72315db Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Thu, 28 Nov 2024 18:16:02 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=8D=95=E5=88=86=E6=8B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/RepairAuditDetailsMapper.java | 2 + .../service/impl/RepairServiceImpl.java | 39 +++++++++---------- .../repair/RepairApplyDetailsMapper.xml | 2 +- .../repair/RepairAuditDetailsMapper.xml | 4 ++ 4 files changed, 25 insertions(+), 22 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairAuditDetailsMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairAuditDetailsMapper.java index c358f421..4d95bcf7 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairAuditDetailsMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairAuditDetailsMapper.java @@ -83,6 +83,8 @@ public interface RepairAuditDetailsMapper { int deleteRepairAuditDetailsByTaskId(Long taskId); + int deleteRepairAuditDetailsByRepairId(@Param("repairId") Long repairId); + /** * 批量删除修试审核详细 * diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java index c182ab8b..1a0dd450 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java @@ -27,6 +27,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; import javax.validation.constraints.NotNull; @@ -849,30 +850,26 @@ public class RepairServiceImpl implements RepairService { // 3.业务逻辑处理 for (RepairTask task : taskList) { - Long wxTaskId = task.getTaskId(); - task.setCreateBy(loginUser.getUserid()); - // 查询任务的协议id - Long agreementId = repairMapper.getAgreementId(task); - // 新增tm_task表数据、修饰审核任务、状态是待审核 - task.setTaskType(TmTaskTypeEnum.TM_TASK_REPAIR_AUDIT.getTaskTypeId()); - task.setTaskStatus(RepairTaskStatusEnum.TASK_STATUS_TO_EXAM.getStatus()); - repairMapper.addTask(task); - - // 循环插入【修饰审核明细表】 - //repairAuditDetailsMapper.deleteRepairAuditDetailsByTaskId(task.getTaskId()); - // 查询维修任务的详情表 + Long wxTaskId = task.getTaskId(); List detailsList = repairApplyDetailsMapper.getDetailsListByTaskIdAndStatus(wxTaskId, "1"); - for (RepairTaskDetails details : detailsList) { - details.setCreateBy(String.valueOf(loginUser.getUserid())); - details.setTaskId(task.getTaskId()); - repairMapper.addAuditDetails(details); + if (!CollectionUtils.isEmpty(detailsList)) { + task.setCreateBy(loginUser.getUserid()); + Long agreementId = repairMapper.getAgreementId(task); + // 新增tm_task表数据、修饰审核任务、状态是待审核 + task.setTaskType(TmTaskTypeEnum.TM_TASK_REPAIR_AUDIT.getTaskTypeId()); + task.setTaskStatus(RepairTaskStatusEnum.TASK_STATUS_TO_EXAM.getStatus()); + repairMapper.addTask(task); + // 新增协议任务表tm_task_agreement--关联修饰任务与协议 + task.setAgreementId(agreementId); + repairMapper.createAgreementTask(task); + // 新增审计记录 + for (RepairTaskDetails details : detailsList) { + details.setCreateBy(String.valueOf(loginUser.getUserid())); + details.setTaskId(task.getTaskId()); + repairMapper.addAuditDetails(details); + } } - repairApplyDetailsMapper.deleteRepairApplyDetailsByTaskIdAndStatus(wxTaskId, "1"); - - // 新增协议任务表--关联修饰任务与协议 - task.setAgreementId(agreementId); - repairMapper.createAgreementTask(task); } return AjaxResult.success(); } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairApplyDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairApplyDetailsMapper.xml index 692b7878..83f5e14b 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairApplyDetailsMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairApplyDetailsMapper.xml @@ -116,7 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" scrap_num as scrapNum, company_id as companyId from repair_apply_details - where task_id = #{taskId} and status = #{status} + where task_id = #{taskId} and status = #{status} and sent_to_next_phase = '0' diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml index caac0cee..6196a440 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml @@ -281,6 +281,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" delete from repair_audit_details where task_id = #{taskId} + + delete from repair_audit_details where repair_id = #{repairId} + + delete from repair_audit_details where id in