From 9fbe13ea0ad930b26d31f997849d80ce75fdd589 Mon Sep 17 00:00:00 2001
From: lst <lst@peony.cn>
Date: Mon, 15 Jul 2024 17:40:38 +0800
Subject: [PATCH] 收支明细导出：金额增加单位并过滤金额为0的数据

---
 backend/chkpower/src/main/resources/mapper/WFinanceDetailMapper.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/chkpower/src/main/resources/mapper/WFinanceDetailMapper.xml b/backend/chkpower/src/main/resources/mapper/WFinanceDetailMapper.xml
index ea85b9e..f08c235 100644
--- a/backend/chkpower/src/main/resources/mapper/WFinanceDetailMapper.xml
+++ b/backend/chkpower/src/main/resources/mapper/WFinanceDetailMapper.xml
@@ -49,11 +49,11 @@
 
 	<select id="mattersIncomerByOrgIdAndDate" resultType="java.lang.String">
 		SELECT
-			GROUP_CONCAT( F_matter, F_income )
+			GROUP_CONCAT( F_matter, F_income,"万" )
 		FROM
 			w_finance_detail w_finance_detail
 		WHERE
-		LENGTH( F_income ) != 0
+		LENGTH( F_income ) != 0 and F_income != 0
 		<if test="orgId != null and orgId != ''">
 			and w_finance_detail.F_org_id = #{orgId}
 		</if>
@@ -64,11 +64,11 @@
 
 	<select id="matterDisbursementByOrgIdAndDate" resultType="java.lang.String">
 		SELECT
-		GROUP_CONCAT( F_matter, F_disbursement )
+		GROUP_CONCAT( F_matter, F_disbursement,"万" )
 		FROM
 		w_finance_detail w_finance_detail
 		WHERE
-		LENGTH( F_disbursement ) != 0
+		LENGTH( F_disbursement ) != 0 and F_disbursement != 0
 		<if test="orgId != null and orgId != ''">
 			and w_finance_detail.F_org_id = #{orgId}
 		</if>
--
libgit2 0.21.2