From 18dbf81e27518fca64cbbbf4dd5b512d1e46449d Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Fri, 23 Aug 2024 15:36:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=80=80=E6=96=99=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E6=9C=BA=E5=85=B7=E7=B1=BB=E5=9E=8B=E6=A0=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BackApplyServiceImpl.java    |  3 +++
 .../mapper/material/BackApplyMapper.xml       | 26 ++++++++-----------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java
index 8cd8420..cb01580 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java
@@ -369,10 +369,13 @@ public class BackApplyServiceImpl implements BackApplyService {
         List<TypeTreeNode> listL3 = new ArrayList<>();
         List<TypeTreeNode> listL21 = new ArrayList<>();
         try {
+            // 先查第四层类型
             listL4 = backApplyMapper.getUseTypeTreeL4(bean);
             List<Long> list4ParentIds = listL4.stream().map(o -> o.getParentId()).collect(Collectors.toList());
+            // 根据第四层parentId 查第三层类型
             listL3 = backApplyMapper.getUseTypeTreeL3(list4ParentIds);
             List<Long> list3ParentIds = listL3.stream().map(o -> o.getParentId()).collect(Collectors.toList());
+            // 根据第三层parentId 查第1.2层类型
             listL21 = backApplyMapper.getUseTypeTreeL21(list3ParentIds);
             list.addAll(listL4);
             list.addAll(listL3);
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
index 36a0e3a..4c0986d 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
@@ -612,24 +612,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getUseTypeTreeL4" resultType="com.bonus.sgzb.material.domain.TypeTreeNode">
         SELECT
-            t4.type_id,
-            t4.type_name,
-            t4.parent_id,
-            t4.unit_name,
-            t4.company_id,
-            COALESCE(SUM(CASE WHEN sai.agreement_id = #{agreementId} AND sai.status = '0' THEN sai.num ELSE 0 END), 0) AS num,
-            4 AS LEVEL
+            mt.type_id,
+            mt.type_name,
+            mt.parent_id,
+            mt.unit_name as unitNames,
+            mt.company_id,
+            SUM( CASE WHEN sai.agreement_id = 78 AND sai.STATUS = '0' THEN sai.num ELSE 0 END ) AS num,
+            mt.LEVEL
         FROM
-            ma_type t4
-                LEFT JOIN slt_agreement_info sai ON t4.type_id = sai.type_id
+            ma_type mt
+                LEFT JOIN slt_agreement_info sai ON mt.type_id = sai.type_id
         WHERE
-            t4.level = 4
-          AND EXISTS (
-            SELECT 1 FROM slt_agreement_info sai2
-            WHERE sai2.type_id = t4.type_id AND sai2.agreement_id = #{agreementId} AND sai2.status = '0'
-        )
+            EXISTS ( SELECT 1 FROM slt_agreement_info sai2 WHERE sai2.type_id = mt.type_id AND sai2.agreement_id = 78 AND sai2.STATUS = '0' and sai.lease_type = 0)
         GROUP BY
-            t4.type_id
+            mt.type_id
     </select>
 
     <select id="getUseTypeTreeL3" resultType="com.bonus.sgzb.material.domain.TypeTreeNode">