From 24b6c7be6e6e240551eb7d66271d4442a59f096a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E7=A6=8F=E6=B5=B7?= <15856818120@163.com> Date: Tue, 4 Jun 2024 15:41:08 +0800 Subject: [PATCH] =?UTF-8?q?bug=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 | 4 ++-- .../main/resources/mapper/material/RepairTestInputMapper.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 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 f7ea8c4c..a1fbc602 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 @@ -247,11 +247,11 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService if (scrapNumList.get(0).getCompanyId() != null) { companyId = scrapNumList.get(0).getCompanyId(); } - taskCode = purchaseCodeRule(TaskTypeConstants.YBF, TaskTypeEnum.REPAIR_TO_BE_SCRAPPED.getCode()); + taskCode = purchaseCodeRule(TaskTypeConstants.BF, TaskTypeEnum.SCRAP_TASK.getCode()); /*taskStatus = 58; taskType = 57;*/ //创建报废任务 - long scrapTaskId = genTask(taskCode, TaskTypeEnum.REPAIR_TO_BE_SCRAPPED.getCode(), Integer.parseInt(TaskStatusEnum.PENDING_REVIEW.getCode()), tmTaskAgreement, companyId); + long scrapTaskId = genTask(taskCode, TaskTypeEnum.SCRAP_TASK.getCode(), Integer.parseInt(TaskStatusEnum.SCRAP_UNDER_REVIEW.getCode()), tmTaskAgreement, companyId); for (RepairAuditDetails scrapDetails : scrapNumList) { RepairAuditDetails byRepairId = scrapApplyDetailsMapper.getByRepairId(String.valueOf(scrapDetails.getRepairId())); List repairRecord = scrapApplyDetailsMapper.getGyoupRepairRecord(byRepairId); diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairTestInputMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairTestInputMapper.xml index e6435cf4..d58158f8 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairTestInputMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairTestInputMapper.xml @@ -68,13 +68,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" b.taskStatus FROM ( SELECT ANY_VALUE(rid.task_id) AS id, - ANY_VALUE(tt2.`code`) AS repairCode, + ANY_VALUE(tt.`code`) AS repairCode, ANY_VALUE(GROUP_CONCAT(DISTINCT a.typeName2)) AS maTypeName, ANY_VALUE(GROUP_CONCAT(DISTINCT a.typeId2)) AS typeId2, bpl.lot_name projectName, bui.unit_name unitName, ANY_VALUE(us.user_name) AS wxName, - ANY_VALUE(tt2.create_time) AS wxTime, + ANY_VALUE(tt.create_time) AS wxTime, ANY_VALUE(IFNULL(sd.`name`,'入库进行中')) AS taskStatus FROM repair_input_details rid LEFT JOIN repair_apply_details rad on rid.repair_id=rad.id