From 04b8cded956c39e08fbf4c63060953397cb94a6b Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Thu, 28 Nov 2024 19:20:35 +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

---
 .../repair/domain/RepairTaskDetails.java      |  3 +++
 .../service/impl/RepairServiceImpl.java       |  7 ++++---
 .../repair/RepairApplyDetailsMapper.xml       | 20 ++++++++++---------
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTaskDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTaskDetails.java
index 60173576..a44ea783 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTaskDetails.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTaskDetails.java
@@ -98,6 +98,9 @@ public class RepairTaskDetails extends BaseEntity {
     @ApiModelProperty(value = "关键字")
     private String keyword;
 
+    @ApiModelProperty(value = "维修任务编码")
+    private String taskCode;
+
     public RepairTaskDetails(Long taskId) {
         this.taskId = taskId;
     }
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 10787156..7b1b206c 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
@@ -804,15 +804,16 @@ public class RepairServiceImpl implements RepairService {
         // 3.业务逻辑处理
         for (RepairTask task : taskList) {
             // 查询维修任务的详情表
-            Long wxTaskId = task.getTaskId();
-            List<RepairTaskDetails> detailsList = repairApplyDetailsMapper.getRepairDetailsWhichNotSent(wxTaskId);
+            Long oldWxTaskId = task.getTaskId();
+            List<RepairTaskDetails> detailsList = repairApplyDetailsMapper.getRepairDetailsWhichNotSent(oldWxTaskId);
             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);
+                task.setRepairCode(detailsList.get(0).getTaskCode());
+                repairMapper.addTask(task); // 注意：此处将会生成新的 taskId （审核入库用的）
                 // 新增协议任务表tm_task_agreement--关联修饰任务与协议
                 task.setAgreementId(agreementId);
                 repairMapper.createAgreementTask(task);
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 ead92559..7c6a4e64 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
@@ -109,15 +109,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <select id="getRepairDetailsWhichNotSent" resultType="com.bonus.material.repair.domain.RepairTaskDetails">
-        select id,
-               ma_id as maId,
-               type_id as typeId,
-               repair_num as repairNum,
-               repaired_num as repairedNum,
-               scrap_num as scrapNum,
-               company_id as companyId
-        from repair_apply_details
-        where task_id = #{taskId} and status = '1' and sent_to_next_phase = '0'
+        select rad.id,
+               rad.ma_id as maId,
+               rad.type_id as typeId,
+               rad.repair_num as repairNum,
+               rad.repaired_num as repairedNum,
+               rad.scrap_num as scrapNum,
+               rad.company_id as companyId,
+               tt.code as taskCode
+        from repair_apply_details rad
+        left join tm_task tt on rad.task_id = tt.task_id
+        where rad.task_id = #{taskId} and rad.status = '1' and rad.sent_to_next_phase = '0'
     </select>
 
     <delete id="deleteRepairApplyDetailsById" parameterType="Long">