From 1969c65c6c8f0b7dafdfc64531ff1854e99f12a7 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Tue, 27 Aug 2024 18:00:18 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E9=80=80=E6=96=99=E6=8E=A5=E6=94=B6?=
 =?UTF-8?q?=E6=97=B6,=E6=A3=80=E6=9F=A5=E7=BB=93=E7=AE=97=E8=A1=A8?=
 =?UTF-8?q?=E6=8B=BF=E5=88=B0=E5=BE=85=E9=80=80=E6=96=99=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?,=E9=98=B2=E6=AD=A2=E5=A4=9A=E9=80=80"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 72d67f1b66832d0022b6c29dbc3611424933054c.
---
 .../mapper/app/BackReceiveMapper.xml          | 42 +++++++++++++++----
 1 file changed, 33 insertions(+), 9 deletions(-)

diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
index 10e6f775..d0bc4741 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
@@ -715,8 +715,8 @@
       bad.audit_num as preNum,
       bad.status as status,
       bad.back_status as backStatus,
-      COALESCE(sai0.num, 0) as num,
-      COALESCE(sai1.num, 0) as finished_back_num,
+      IFNULL(bad.audit_num,0)-IFNULL(aa.back_num,0) as num,
+      bb.finished_back_num,
       mt.manage_type as manageType,
       mt.company_id as companyId,
       CONCAT('NSJJ',mt.`code`,mt.model_code) as `code`
@@ -724,12 +724,28 @@
       back_apply_details bad
         LEFT JOIN back_apply_info bai on bai.id=bad.parent_id
         LEFT JOIN tm_task_agreement tta on tta.task_id=bai.task_id
-        LEFT JOIN (select agreement_id, sum(COALESCE(num, 0)) as num from slt_agreement_info where status=0
-            group by agreement_id) sai0 on tta.agreement_id=sai0.agreement_id
-        LEFT JOIN (select agreement_id, sum(COALESCE(num, 0)) as num from slt_agreement_info where status=1
-            group by agreement_id) sai1 on tta.agreement_id=sai1.agreement_id
         LEFT JOIN ma_type mt on mt.type_id=bad.type_id
         LEFT JOIN ma_type mt2 ON mt2.type_id=mt.parent_id
+        LEFT JOIN (
+        SELECT
+          type_id as typeId,
+          SUM(IFNULL(back_num,0)) as back_num
+        FROM
+          back_check_details
+        WHERE
+          parent_id=#{id}
+        GROUP BY type_id
+      ) aa on aa.typeId=bad.type_id
+      LEFT JOIN (
+        SELECT
+        type_id as typeId,
+        SUM(IFNULL(back_num,0)) as finished_back_num
+        FROM
+        back_check_details
+        WHERE
+        parent_id=#{id} and is_finished = 1
+        GROUP BY type_id
+      ) bb on bb.typeId=bad.type_id
     WHERE
       bai.id=#{id}
       <if test="typeId != null and typeId != ''">
@@ -1114,17 +1130,25 @@
     bad.audit_num as preNum,
     bad.status as status,
     bad.back_status as backStatus,
-    COALESCE(sai.num, 0) as num,
+    IFNULL(bad.audit_num,0)-IFNULL(aa.back_num,0) as num,
     mt.manage_type as manageType,
     CONCAT('NSJJ',mt.`code`,mt.model_code) as `code`
     FROM
     back_apply_details bad
     LEFT JOIN back_apply_info bai on bai.id=bad.parent_id
     LEFT JOIN tm_task_agreement tta on tta.task_id=bai.task_id
-    LEFT JOIN (select agreement_id, sum(COALESCE(num, 0)) as num from slt_agreement_info where status=0
-               group by agreement_id) sai on tta.agreement_id=sai.agreement_id
     LEFT JOIN ma_type mt on mt.type_id=bad.type_id
     LEFT JOIN ma_type mt2 ON mt2.type_id=mt.parent_id
+    LEFT JOIN (
+    SELECT
+    type_id as typeId,
+    SUM(IFNULL(back_num,0)) as back_num
+    FROM
+    back_check_details
+    WHERE
+    parent_id=#{id}
+    GROUP BY type_id
+    ) aa on aa.typeId=bad.type_id
     WHERE
     bai.id=#{id}
     order by bad.create_time