From 5f4725250ddd563261778bed0a4a796d410cafcb Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Thu, 28 Nov 2024 17:28:22 +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/mapper/RepairApplyDetailsMapper.java  | 10 ++++++++++
 .../material/repair/mapper/RepairMapper.java     |  6 ------
 .../repair/service/impl/RepairServiceImpl.java   |  4 +++-
 .../material/repair/RepairApplyDetailsMapper.xml | 16 ++++++++++++++++
 .../mapper/material/repair/RepairMapper.xml      | 12 ------------
 5 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairApplyDetailsMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairApplyDetailsMapper.java
index caa9eec0..48c51ca7 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairApplyDetailsMapper.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairApplyDetailsMapper.java
@@ -2,6 +2,8 @@ package com.bonus.material.repair.mapper;
 
 import java.util.List;
 import com.bonus.material.repair.domain.RepairApplyDetails;
+import com.bonus.material.repair.domain.RepairTaskDetails;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 维修详细Mapper接口
@@ -42,6 +44,12 @@ public interface RepairApplyDetailsMapper {
      */
     public int updateRepairApplyDetails(RepairApplyDetails repairApplyDetails);
 
+    /**
+     * 根据任务Id获取维修详细
+     * @param taskId 任务信息ID
+     */
+    List<RepairTaskDetails> getDetailsListByTaskIdAndStatus(@Param("taskId") Long taskId, @Param("status") String status);
+
     /**
      * 删除维修详细
      * 
@@ -50,6 +58,8 @@ public interface RepairApplyDetailsMapper {
      */
     public int deleteRepairApplyDetailsById(Long id);
 
+    public int deleteRepairApplyDetailsByTaskIdAndStatus(@Param("taskId") Long taskId, @Param("status") String status);
+
     /**
      * 批量删除维修详细
      * 
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairMapper.java
index 4ba69a06..e869a16c 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairMapper.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairMapper.java
@@ -132,12 +132,6 @@ public interface RepairMapper {
      */
     int getUnFinish(RepairTask task);
 
-    /**
-     * 根据任务Id获取维修详细
-     * @param taskId 任务信息ID
-     */
-    List<RepairTaskDetails> getDetailsListByTaskIdAndStatus(@Param("taskId") Long taskId, @Param("status") String status);
-
     /**
      * 新增修饰审核审核数据
      * @param details 数据详情
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 8d6d8189..c182ab8b 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
@@ -862,12 +862,14 @@ public class RepairServiceImpl implements RepairService {
             //repairAuditDetailsMapper.deleteRepairAuditDetailsByTaskId(task.getTaskId());
 
             // 查询维修任务的详情表
-            List<RepairTaskDetails> detailsList = repairMapper.getDetailsListByTaskIdAndStatus(wxTaskId, "1");
+            List<RepairTaskDetails> detailsList = repairApplyDetailsMapper.getDetailsListByTaskIdAndStatus(wxTaskId, "1");
             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);
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 c3f81364..692b7878 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
@@ -107,10 +107,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <select id="getDetailsListByTaskIdAndStatus" 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 = #{status}
+    </select>
+
     <delete id="deleteRepairApplyDetailsById" parameterType="Long">
         delete from repair_apply_details where id = #{id}
     </delete>
 
+    <delete id="deleteRepairApplyDetailsByTaskIdAndStatus">
+        delete from repair_apply_details where task_id = #{taskId} and status = #{status}
+    </delete>
+
     <delete id="deleteRepairApplyDetailsByIds" parameterType="String">
         delete from repair_apply_details where id in 
         <foreach item="id" collection="array" open="(" separator="," close=")">
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml
index e996ea62..d7925ef7 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml
@@ -399,18 +399,6 @@
         where task_id = #{taskId} and status = '0'
     </select>
 
-    <select id="getDetailsListByTaskIdAndStatus" 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 = #{status}
-    </select>
-
     <select id="selectPartPrice" resultType="java.math.BigDecimal">
         select ifnull(buy_price,0) from ma_part_type where pa_id = #{partId}
     </select>