From db4d44e1e7faeb5f3a2fb9a4e591bcd40c33de45 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Tue, 20 Aug 2024 17:45:27 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E7=BC=96=E7=A0=81=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=BA=93=E5=AD=98=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/app/TmTaskMapper.xml     | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/TmTaskMapper.xml
index 2e6947c..8daffb9 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/TmTaskMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/TmTaskMapper.xml
@@ -963,12 +963,27 @@
     SELECT
       lad.*, mt.type_name AS typeModelName, mt1.type_name AS typeName,mt.unit_name as unitName, mt.manage_type as manageType,
       case WHEN mt.manage_type = '0' then '编号' else '计数' end manageTypeName,
-      IFNULL(mt.num,0) AS num, (lad.pre_num - IF(lad.al_num IS NULL,'0',lad.al_num)) AS outNum,mm.ma_code as maCode
+      CASE mt.manage_type
+        WHEN 0 THEN
+          IFNULL(subquery0.num, 0)
+        ELSE
+          IFNULL(mt.num, 0)
+        END as num,
+      (lad.pre_num - IF(lad.al_num IS NULL,'0',lad.al_num)) AS outNum, subquery0.ma_code as maCode
     FROM
       lease_apply_details lad
         LEFT JOIN ma_type mt ON lad.type_id = mt.type_id
         LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id
-        LEFT JOIN ma_machine mm ON lad.type_id = mm.type_id
+        LEFT JOIN (SELECT mt.type_id,
+                          mt2.type_name AS             typeName,
+                          mt.type_name  AS             typeModelName,
+                          mm.ma_code,
+                          count(mm.ma_id) num
+                   FROM ma_machine mm
+                          LEFT JOIN ma_type mt ON mt.type_id = mm.type_id
+                          LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id
+                   WHERE mm.ma_code is not null and mm.ma_status in (15)
+                   GROUP BY mt.type_id) AS subquery0 ON subquery0.type_id = lad.type_id
     WHERE
       lad.parennt_id = #{record.id}
     GROUP BY