From 5bc911baf8217f9faf9c457e9a34b3a4fe89a7b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E7=A6=8F=E6=B5=B7?= <15856818120@163.com> Date: Wed, 15 May 2024 10:13:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E6=8A=A5=E5=BA=9F=E5=8D=95=E5=8F=B7?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/service/impl/RepairAuditDetailsServiceImpl.java | 2 +- .../main/resources/mapper/material/ScrapApplyDetailsMapper.xml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java index 47122803..c4543ce2 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java @@ -265,7 +265,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService taskCode = purchaseCodeRule(TaskTypeConstants.YBF, TaskTypeEnum.REPAIR_TO_BE_SCRAPPED.getCode()); /*taskStatus = 58; taskType = 57;*/ - //创建报废任务 + //创建待报废任务 long scrapTaskId = genTask(taskCode, TaskTypeEnum.REPAIR_TO_BE_SCRAPPED.getCode(), Integer.parseInt(TaskStatusEnum.PENDING_REVIEW.getCode()), tmTaskAgreement, companyId); for (RepairAuditDetails scrapDetails : scrapNumList) { RepairAuditDetails byRepairId = scrapApplyDetailsMapper.getByRepairId(String.valueOf(scrapDetails.getRepairId())); diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapApplyDetailsMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapApplyDetailsMapper.xml index dd46db4b..fd9388d5 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapApplyDetailsMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapApplyDetailsMapper.xml @@ -441,8 +441,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN scrap_apply_details sad ON tk.task_id = sad.task_id LEFT JOIN repair_audit_details rad ON sad.parent_id = rad.id LEFT JOIN back_apply_info rad3 ON sad.parent_id = rad3.id - LEFT JOIN repair_apply_details rad2 ON rad.repair_id = rad2.id - LEFT JOIN tm_task tk1 ON rad2.task_id = tk1.task_id + LEFT JOIN tm_task tk1 ON rad.task_id = tk1.task_id LEFT JOIN ( SELECT id,