From ed90d2750b71248e0c244fb30f9cd61ff77cda91 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Wed, 17 Jul 2024 17:36:14 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=96=99=E5=AE=8C=E6=88=90=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/sgzb/app/controller/BackReceiveController.java   | 1 +
 .../bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java    | 3 ++-
 .../main/resources/mapper/material/ScrapApplyDetailsMapper.xml | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java
index 6c23bc5d..125729b7 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java
@@ -122,6 +122,7 @@ public class BackReceiveController extends BaseController {
         String[] split = record.getTypeId().split(",");
         for (String s : split) {
             record.setModelId(s);
+            record.setTypeId(null);
             List<BackApplyInfo> list = backReceiveService.receiveView(record);
             for (BackApplyInfo backApplyInfo : list) {
                 if (Double.valueOf(backApplyInfo.getNum()).intValue() != 0) {
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java
index 5dd77e58..0007f856 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java
@@ -200,6 +200,7 @@ public class BackReceiveServiceImpl implements BackReceiveService {
                     }
 
                 }
+
                 //维修的创建维修任务，插入任务协议表
                 List<BackApplyInfo> wxList = backReceiveMapper.getWxList(record);
                 if (wxList != null && wxList.size() > 0) {
@@ -210,8 +211,8 @@ public class BackReceiveServiceImpl implements BackReceiveService {
                     //插入维修记录表repair_apply_details
                     res = insertRad(newTaskId, wxList);
                 }
-                //待报废的创建报废任务，插入任务协议表
 
+                //待报废的创建报废任务，插入任务协议表
                 List<BackApplyInfo> bfList = backReceiveMapper.getBfList(record);
                 if (bfList != null && bfList.size() > 0) {
                     //插入任务表tm_task
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 836e1e49..c37beaef 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
@@ -1078,6 +1078,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     scrap_check_details scd1
                         LEFT JOIN scrap_apply_details sad1 ON scd1.parent_id = sad1.parent_id
                         AND scd1.type_id = sad1.type_id
+                WHERE sad1.task_id = #{taskId}
                 GROUP BY
                     scd1.parent_id,
                     sad1.type_id