From c479476ee829669cbb00812549c5bd19cb89e0cd Mon Sep 17 00:00:00 2001
From: chenwei <timeless646@163.com>
Date: Tue, 9 Jul 2024 15:17:02 +0800
Subject: [PATCH] 导出功能优化

---
 backend/chkpower/src/main/resources/mapper/WCurrentMapper.xml | 42 +++++++++++++++++++++++-------------------
 backend/chkpower/src/main/resources/mapper/WFinanceMapper.xml | 26 +++++++++++++-------------
 2 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/backend/chkpower/src/main/resources/mapper/WCurrentMapper.xml b/backend/chkpower/src/main/resources/mapper/WCurrentMapper.xml
index 8b9c9d8..a9d643d 100644
--- a/backend/chkpower/src/main/resources/mapper/WCurrentMapper.xml
+++ b/backend/chkpower/src/main/resources/mapper/WCurrentMapper.xml
@@ -75,20 +75,20 @@
         FROM uc_org  org
         JOIN w_bank_account acc ON acc.F_org_id= org.ID_
         LEFT JOIN (
-        SELECT c1.F_org_id, c1.F_bank_account, c1.F_date, c1.F_account_balance, c1.F_available_balance, c1.F_freeze_amount, c1.F_freezing, c1.F_notes,c1.id_
-        FROM w_current c1
-        JOIN (
-        SELECT c3.F_org_id, c3.F_bank_account,max(c3.id_) as id_ FROM w_current c3
-        JOIN (
-        SELECT DISTINCT F_org_id, F_bank_account, MAX(F_date) as MaxDate
-        FROM w_current
-        GROUP BY F_org_id, F_bank_account
-        ) c4 ON c3.F_org_id = c4.F_org_id AND c3.F_bank_account = c4.F_bank_account AND c3.F_date = c4.MaxDate
-        GROUP BY c3.F_org_id, c3.F_bank_account
-        ) c2
-        ON c1.F_org_id = c2.F_org_id AND c1.F_bank_account = c2.F_bank_account AND c1.id_ = c2.id_
+            SELECT c1.F_org_id, c1.F_bank_account, c1.F_date, c1.F_account_balance, c1.F_available_balance, c1.F_freeze_amount, c1.F_freezing, c1.F_notes,c1.id_
+            FROM w_current c1
+            JOIN (
+                SELECT c3.F_org_id, c3.F_bank_account,max(c3.id_) as id_ FROM w_current c3
+                JOIN (
+                    SELECT DISTINCT F_org_id, F_bank_account, MAX(F_date) as MaxDate
+                    FROM w_current
+                    GROUP BY F_org_id, F_bank_account
+                ) c4 ON c3.F_org_id = c4.F_org_id AND c3.F_bank_account = c4.F_bank_account AND c3.F_date = c4.MaxDate
+                GROUP BY c3.F_org_id, c3.F_bank_account
+            ) c2
+            ON c1.F_org_id = c2.F_org_id AND c1.F_bank_account = c2.F_bank_account AND c1.id_ = c2.id_
         ) zh on zh.F_org_id = acc.F_org_id and zh.F_bank_account = acc.F_bank_account
-        WHERE 1=1
+        WHERE 1=1 AND ACC.F_use_status !='停用'
         <if test="orgIdList != null and orgIdList.size() > 0">
             and  org.ID_ in
             <foreach collection="orgIdList" separator="," item="orgId" open="(" close=")">
@@ -101,24 +101,28 @@
     </select>
 
     <select id="getCurrentAccountBalanceList" resultType="java.util.HashMap">
-        SELECT org.ID_ as F_org_id,org.NAME_  as F_org_name,acc.F_org_type,org.ORDER_NO_,YE.F_account_balance
+        SELECT org.ID_ as F_org_id,org.NAME_  as F_org_name,orgParams.VALUE_ as F_org_type,org.ORDER_NO_,YE.F_account_balance
         FROM uc_org  org
-            INNER JOIN w_bank_account acc ON acc.F_org_id= org.ID_
-            LEFT JOIN (
+        JOIN uc_org_params orgParams on orgParams.ORG_ID_= org.ID_
+        LEFT JOIN (
             SELECT F_org_id, F_org_name,SUM(F_account_balance) AS F_account_balance
             FROM w_current
             WHERE DATE(F_date) =DATE(#{fDate})
             GROUP BY F_org_id, F_org_name
-        ) YE ON YE.F_org_id = acc.F_org_id
+        ) YE ON YE.F_org_id = org.ID_
         WHERE 1=1
-        AND acc.F_org_type= #{fOrgType}
-        ORDER BY org.ORDER_NO_ ASC
+        AND orgParams.VALUE_ !=''
+        AND orgParams.VALUE_ = #{fOrgType}
+        ORDER BY orgParams.VALUE_,org.ORDER_NO_ ASC
     </select>
 
     <select id="getCurrentOrgTypeList" resultType="java.lang.String">
         SELECT orgParams.VALUE_ AS orgType
         FROM uc_org  org
         JOIN uc_org_params orgParams  on orgParams.ORG_ID_= org.ID_
+        WHERE 1=1
+        AND orgParams.VALUE_ !=''
+        AND orgParams.VALUE_ IS NOT NULL
         GROUP BY  orgParams.VALUE_
         ORDER BY MAX(org.ORDER_NO_) ASC
     </select>
diff --git a/backend/chkpower/src/main/resources/mapper/WFinanceMapper.xml b/backend/chkpower/src/main/resources/mapper/WFinanceMapper.xml
index 49cb1fb..d82d8da 100644
--- a/backend/chkpower/src/main/resources/mapper/WFinanceMapper.xml
+++ b/backend/chkpower/src/main/resources/mapper/WFinanceMapper.xml
@@ -58,19 +58,19 @@
 	</select>
 
     <select id="getTransactionDetailsList" resultType="java.util.HashMap">
-    SELECT org.ID_ as F_org_id,org.NAME_  as F_org_name,acc.F_org_type,org.ORDER_NO_,
-    JE.F_total_income,JE.F_total_disbursement,JE.F_total_net_cash_flow
-    FROM uc_org  org
-    INNER JOIN w_bank_account acc ON acc.F_org_id= org.ID_
-    LEFT JOIN (
-        SELECT F_org_id,SUM(F_total_income) AS F_total_income,SUM(F_total_disbursement) AS F_total_disbursement,SUM(F_total_net_cash_flow) AS F_total_net_cash_flow
-        FROM w_finance
-        WHERE DATE(F_date) = DATE(#{fDate})
-        GROUP BY F_org_id
-    ) JE ON JE.F_org_id = org.ID_
-    WHERE 1=1
-    AND acc.F_org_type= #{fOrgType}
-    ORDER BY org.ORDER_NO_ ASC
+        SELECT org.ID_ as F_org_id,org.NAME_  as F_org_name,orgParams.VALUE_ as F_org_type,org.ORDER_NO_,
+        JE.F_total_income,JE.F_total_disbursement,JE.F_total_net_cash_flow
+        FROM uc_org  org
+        JOIN uc_org_params orgParams on orgParams.ORG_ID_= org.ID_
+        LEFT JOIN (
+            SELECT F_org_id,SUM(F_total_income) AS F_total_income,SUM(F_total_disbursement) AS F_total_disbursement,SUM(F_total_net_cash_flow) AS F_total_net_cash_flow
+            FROM w_finance
+            WHERE DATE(F_date) = DATE(#{fDate})
+            GROUP BY F_org_id
+        ) JE ON JE.F_org_id = org.ID_
+        WHERE 1=1 AND orgParams.VALUE_ !=''
+        AND orgParams.VALUE_ = #{fOrgType}
+        ORDER BY orgParams.VALUE_,org.ORDER_NO_ ASC
     </select>
 
     <update id="updateInsp" parameterType="com.hotent.chkpower.model.WFinance">
--
libgit2 0.21.2