From 4b8923c8ccec090b5dd1622f544063152d065da0 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Sat, 7 Sep 2024 15:11:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/app/BackReceiveMapper.xml          | 19 ++++++++++++++++++-
 .../mapper/app/LeaseOutDetailsMapper.xml      | 19 ++++++++++++++++++-
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/BackReceiveMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/BackReceiveMapper.xml
index 79b53dd..aaf369f 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/BackReceiveMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/BackReceiveMapper.xml
@@ -778,7 +778,24 @@
   </select>
 
   <select id="getmaChineByCt" resultType="java.lang.Integer">
-    select num from ma_type WHERE type_id = #{typeId}
+      SELECT
+        CASE mt.manage_type
+          WHEN 0 THEN
+            IFNULL(subquery0.num, 0)
+          ELSE
+            IFNULL(mt.num, 0)
+          END as num
+      FROM ma_type mt
+             left join (SELECT mt.type_id,
+                               mt2.type_name AS             typeName,
+                               mt.type_name  AS             typeModelName,
+                               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 = mt.type_id
+      WHERE mt.del_flag = '0' and mt.type_id = #{typeId}
   </select>
 
   <select id="selectTaskNumByMonthWx" resultType="java.lang.Integer">
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml
index 694e503..93664c4 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml
@@ -450,7 +450,24 @@
             mt.type_id = #{typeId}
     </select>
     <select id="getmaChineByCt" resultType="java.lang.Integer">
-        select num from ma_type WHERE type_id = #{typeId}
+        SELECT
+            CASE mt.manage_type
+                WHEN 0 THEN
+                    IFNULL(subquery0.num, 0)
+                ELSE
+                    IFNULL(mt.num, 0)
+                END as num
+        FROM ma_type mt
+                 left join (SELECT mt.type_id,
+                                   mt2.type_name AS             typeName,
+                                   mt.type_name  AS             typeModelName,
+                                   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 = mt.type_id
+        WHERE mt.del_flag = '0' and mt.type_id = #{typeId}
     </select>
     <select id="getLeaseApplyDetails" resultType="com.bonus.sgzb.app.domain.LeaseApplyDetails">
         SELECT