From a212fef4891c423710733634e7fb372387700249 Mon Sep 17 00:00:00 2001
From: "1539530615@qq.com" <1539530615@qq.com>
Date: Thu, 7 Mar 2024 17:52:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E8=AF=95=E5=AE=A1=E6=A0=B8=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ScrapApplyDetailsMapper.java       |  2 ++
 .../impl/RepairAuditDetailsServiceImpl.java   | 29 +++++++++++--------
 .../material/ScrapApplyDetailsMapper.xml      | 18 ++++++++++++
 3 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ScrapApplyDetailsMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ScrapApplyDetailsMapper.java
index 29923bee..2fb8cf1d 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ScrapApplyDetailsMapper.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ScrapApplyDetailsMapper.java
@@ -157,4 +157,6 @@ public interface ScrapApplyDetailsMapper
     List<RepairRecord> getRepairRecord(RepairAuditDetails bean);
 
     String getFileUrl(String s);
+
+    List<RepairRecord> getGyoupRepairRecord(RepairAuditDetails byRepairId);
 }
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 8a9e36c4..03e969be 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,23 +247,28 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
                     taskType = 57;
                     long scrapTaskId = genTask(taskCode, taskType, taskStatus, tmTaskAgreement, companyId);
                     for (RepairAuditDetails scrapDetails : scrapNumList) {
+                        RepairAuditDetails byRepairId = scrapApplyDetailsMapper.getByRepairId(String.valueOf(scrapDetails.getRepairId()));
+                        List<RepairRecord> repairRecord = scrapApplyDetailsMapper.getGyoupRepairRecord(byRepairId);
                         Long typeId = scrapDetails.getTypeId();
                         Long maId = scrapDetails.getMaId();
                         // 创建报废任务
                         BigDecimal scrapNum = scrapDetails.getScrapNum();
                         if (scrapNum.compareTo(b) > 0) {
-                            ScrapApplyDetails scrapApplyDetails = new ScrapApplyDetails();
-                            scrapApplyDetails.setTaskId(scrapTaskId);
-                            scrapApplyDetails.setTypeId(typeId);
-                            scrapApplyDetails.setMaId(maId);
-                            scrapApplyDetails.setScrapNum(scrapNum);
-                            scrapApplyDetails.setScrapSource("2");
-                            scrapApplyDetails.setStatus("0");
-                            scrapApplyDetails.setParentId(scrapDetails.getId());
-                            scrapApplyDetails.setCreateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid()));
-                            scrapApplyDetails.setCreateTime(new Date());
-                            scrapApplyDetails.setCompanyId((long) companyId);
-                            scrapApplyDetailsMapper.insertScrapApplyDetails(scrapApplyDetails);
+                            for (RepairRecord bean : repairRecord){
+                                ScrapApplyDetails scrapApplyDetails = new ScrapApplyDetails();
+                                scrapApplyDetails.setTaskId(scrapTaskId);
+                                scrapApplyDetails.setTypeId(typeId);
+                                scrapApplyDetails.setMaId(maId);
+                                scrapApplyDetails.setScrapNum(BigDecimal.valueOf(bean.getScrapNum()));
+                                scrapApplyDetails.setScrapType(bean.getScrapType());
+                                scrapApplyDetails.setScrapSource("2");
+                                scrapApplyDetails.setStatus("0");
+                                scrapApplyDetails.setParentId(scrapDetails.getId());
+                                scrapApplyDetails.setCreateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid()));
+                                scrapApplyDetails.setCreateTime(new Date());
+                                scrapApplyDetails.setCompanyId((long) companyId);
+                                scrapApplyDetailsMapper.insertScrapApplyDetails(scrapApplyDetails);
+                            }
                         }
                     }
 
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 575415e1..65456940 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
@@ -383,5 +383,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from sys_file_info
         where id = #{s}
     </select>
+    <select id="getGyoupRepairRecord" resultType="com.bonus.sgzb.material.domain.RepairRecord">
+        select sum(scrap_num) as scrapNum,
+        scrap_reason as scrapReason,
+        scrap_type as scrapType,
+        file_ids as fileIds
+        from repair_apply_record rar
+        where repair_type = '3'
+        <if test="taskId != null and taskId != ''">
+            and rar.task_id = #{taskId}
+        </if>
+        <if test="maId != null and maId != ''">
+            and rar.ma_id = #{maId}
+        </if>
+        <if test="typeId != null and typeId != ''">
+            and rar.type_id = #{typeId}
+        </if>
+        group by scrap_type
+    </select>
 
 </mapper>
\ No newline at end of file