From e8d2ea9df72da7962789d5975929253b4e3cea94 Mon Sep 17 00:00:00 2001
From: dinggang <2498628697@qq.com>
Date: Wed, 23 Nov 2022 09:12:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E9=94=99=E8=AF=AF=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processForm/TAbilityApplicationDao.xml    | 44 ++++++++-----------
 1 file changed, 18 insertions(+), 26 deletions(-)

diff --git a/renren-admin/src/main/resources/mapper/processForm/TAbilityApplicationDao.xml b/renren-admin/src/main/resources/mapper/processForm/TAbilityApplicationDao.xml
index 5300f4c4..61932cac 100644
--- a/renren-admin/src/main/resources/mapper/processForm/TAbilityApplicationDao.xml
+++ b/renren-admin/src/main/resources/mapper/processForm/TAbilityApplicationDao.xml
@@ -350,25 +350,23 @@
 
     <select id="getFundStatement" resultType="java.util.Map">
         SELECT
-            taa.id,
-            tdr.NAME AS "resourceName",
-            ( CASE tdr.type WHEN '应用资源' THEN tdr.type WHEN '组件服务' THEN tda.attr_value ELSE tdr.type END ) AS "resourceType",
-            sd.name AS "provideDept",
-            taa.unit AS "applyDept",
-            taa.create_date AS "applyDate",
-            taa.apply_price AS "applyPrice"
+        taa.id,
+        tdr.NAME AS "resourceName",
+        ( CASE tdr.type WHEN '应用资源' THEN tdr.type WHEN '组件服务' THEN attr.attr_value ELSE tdr.type END ) AS "resourceType",
+        sd.NAME AS "provideDept",
+        taa.unit AS "applyDept",
+        taa.create_date AS "applyDate",
+        taa.apply_price AS "applyPrice"
         FROM
-            t_ability_application taa
+        t_ability_application taa
         LEFT JOIN tb_data_resource tdr ON taa.resource_id = tdr.id
         LEFT JOIN sys_dept sd ON tdr.dept_id = sd.id
-        LEFT JOIN tb_data_attr tda ON tdr.id = tda.data_resource_id
+        LEFT JOIN ( SELECT data_resource_id, attr_type, attr_value FROM tb_data_attr tda WHERE del_flag = 0 AND attr_type = '组件类型' ) attr ON tdr.id = attr.data_resource_id
         WHERE
-            1 = 1
-          AND taa.approve_status IN ( '审核中', '通过' )
-          AND taa.del_flag = 0
-          AND tdr.del_flag = 0
-          AND tda.del_flag = 0
-          AND tda.attr_type = '组件类型'
+        1 = 1
+        AND taa.approve_status IN ( '审核中', '通过' )
+        AND taa.del_flag = 0
+        AND tdr.del_flag = 0
         <if test = "params.startDate != null and params.startDate != ''" >
             AND taa.create_date >= #{params.startDate}
         </if>
@@ -432,14 +430,12 @@
         t_ability_application taa
         LEFT JOIN tb_data_resource tdr ON taa.resource_id = tdr.id
         LEFT JOIN sys_dept sd ON tdr.dept_id = sd.id
-        LEFT JOIN tb_data_attr tda ON tdr.id = tda.data_resource_id
+        LEFT JOIN ( SELECT data_resource_id, attr_type, attr_value FROM tb_data_attr tda WHERE del_flag = 0 AND attr_type = '组件类型' ) attr ON tdr.id = attr.data_resource_id
         WHERE
         1 = 1
         AND taa.approve_status IN ( '审核中', '通过' )
         AND taa.del_flag = 0
         AND tdr.del_flag = 0
-        AND tda.del_flag = 0
-        AND tda.attr_type = '组件类型'
         <if test = "params.startDate != null and params.startDate != ''" >
             AND taa.create_date >= #{params.startDate}
         </if>
@@ -492,8 +488,8 @@
         SELECT
         taa.id,
         tdr.NAME AS "resourceName",
-        ( CASE tdr.type WHEN '应用资源' THEN tdr.type WHEN '组件服务' THEN tda.attr_value ELSE tdr.type END ) AS "resourceType",
-        sd.name AS "provideDept",
+        ( CASE tdr.type WHEN '应用资源' THEN tdr.type WHEN '组件服务' THEN attr.attr_value ELSE tdr.type END ) AS "resourceType",
+        sd.NAME AS "provideDept",
         taa.unit AS "applyDept",
         taa.create_date AS "applyDate",
         taa.apply_price AS "applyPrice"
@@ -501,14 +497,12 @@
         t_ability_application taa
         LEFT JOIN tb_data_resource tdr ON taa.resource_id = tdr.id
         LEFT JOIN sys_dept sd ON tdr.dept_id = sd.id
-        LEFT JOIN tb_data_attr tda ON tdr.id = tda.data_resource_id
+        LEFT JOIN ( SELECT data_resource_id, attr_type, attr_value FROM tb_data_attr tda WHERE del_flag = 0 AND attr_type = '组件类型' ) attr ON tdr.id = attr.data_resource_id
         WHERE
         1 = 1
         AND taa.approve_status IN ( '审核中', '通过' )
         AND taa.del_flag = 0
         AND tdr.del_flag = 0
-        AND tda.del_flag = 0
-        AND tda.attr_type = '组件类型'
         <if test = "params.startDate != null and params.startDate != ''" >
             AND taa.create_date >= #{params.startDate}
         </if>
@@ -571,14 +565,12 @@
         t_ability_application taa
         LEFT JOIN tb_data_resource tdr ON taa.resource_id = tdr.id
         LEFT JOIN sys_dept sd ON tdr.dept_id = sd.id
-        LEFT JOIN tb_data_attr tda ON tdr.id = tda.data_resource_id
+        LEFT JOIN ( SELECT data_resource_id, attr_type, attr_value FROM tb_data_attr tda WHERE del_flag = 0 AND attr_type = '组件类型' ) attr ON tdr.id = attr.data_resource_id
         WHERE
         1 = 1
         AND taa.approve_status IN ( '审核中', '通过' )
         AND taa.del_flag = 0
         AND tdr.del_flag = 0
-        AND tda.del_flag = 0
-        AND tda.attr_type = '组件类型'
         <if test = "params.startDate != null and params.startDate != ''" >
             AND taa.create_date >= #{params.startDate}
         </if>