From 5f9211b19c7cf09a9c04824fa958ba7926d5d517 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Mon, 25 Nov 2024 17:03:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/repair/mapper/RepairInputDetailsMapper.java | 2 ++
 .../service/impl/RepairAuditDetailsServiceImpl.java      | 9 ++++++---
 .../mapper/material/repair/RepairInputDetailsMapper.xml  | 4 ++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairInputDetailsMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairInputDetailsMapper.java
index 4e258c50..497db5a4 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairInputDetailsMapper.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairInputDetailsMapper.java
@@ -54,6 +54,8 @@ public interface RepairInputDetailsMapper {
      */
     public int deleteRepairInputDetailsById(Long id);
 
+    public int deleteRepairInputDetailsByTaskId(Long taskId);
+
     /**
      * 批量删除修试后入库
      * 
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java
index b5eed3de..4ff31ef0 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java
@@ -468,7 +468,8 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
         if (CollectionUtils.isEmpty(repairAuditDetailsByQuery)) {
             return 0;
         }
-        batchInsertRepairInputDetails(repairAuditDetailsByQuery);
+        repairInputDetailsMapper.deleteRepairInputDetailsByTaskId(repairAuditDetails.get(0).getTaskId());
+        batchInsertRepairInputDetails(repairAuditDetailsByQuery, repairAuditDetails.get(0).getStatus());
         try {
             List<Long> ids = repairAuditDetailsByQuery.stream()
                     .filter(Objects::nonNull)
@@ -497,7 +498,8 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
         if (ids.isEmpty()) {
             return 0;
         }
-        batchInsertRepairInputDetails(repairAuditDetails);
+        //repairInputDetailsMapper.deleteRepairInputDetailsByIds((Long[]) ids.toArray());
+        batchInsertRepairInputDetails(repairAuditDetails, repairAuditDetails.get(0).getStatus());
         try {
             return repairAuditDetailsMapper.updateRepairAuditDetailsBatch(ids, String.valueOf(repairAuditDetails.get(0).getStatus()));
         } catch (Exception e) {
@@ -505,12 +507,13 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
         }
     }
 
-    private void batchInsertRepairInputDetails(List<RepairAuditDetails> repairAuditDetailsByQuery) {
+    private void batchInsertRepairInputDetails(List<RepairAuditDetails> repairAuditDetailsByQuery, String status) {
         List<RepairInputDetails> inputList = new ArrayList<>();
         for (RepairAuditDetails details : repairAuditDetailsByQuery) {
             RepairInputDetails inputVo = new RepairInputDetails();
             BeanUtils.copyProperties(details, inputVo);
             inputVo.setAuditId(details.getId());
+            inputVo.setStatus(status);
             inputList.add(inputVo);
         }
         repairInputDetailsMapper.batchInsertRepairInputDetails(inputList);
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairInputDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairInputDetailsMapper.xml
index 6d7abab4..68072d77 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairInputDetailsMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairInputDetailsMapper.xml
@@ -116,6 +116,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         delete from repair_input_details where id = #{id}
     </delete>
 
+    <delete id="deleteRepairInputDetailsByTaskId" parameterType="Long">
+        delete from repair_input_details where task_id = #{taskId}
+    </delete>
+
     <delete id="deleteRepairInputDetailsByIds" parameterType="String">
         delete from repair_input_details where id in 
         <foreach item="id" collection="array" open="(" separator="," close=")">