From 0ed29a9b6e7cdeeea5f736d5cbe196849b4f22f7 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期三, 19 七月 2023 09:40:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xinghong-dev
---
java110-db/src/main/resources/mapper/report/ReportCommunityServiceDaoImplMapper.xml | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/report/ReportCommunityServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/report/ReportCommunityServiceDaoImplMapper.xml
index 60226b8..d6c81fa 100755
--- a/java110-db/src/main/resources/mapper/report/ReportCommunityServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/report/ReportCommunityServiceDaoImplMapper.xml
@@ -387,11 +387,20 @@
feeName,t.payment_cycle paymentCycle,t.start_time startTime,t.end_time
endTime,t.community_id communityId,t.deduct_from deductFrom,
t.pay_online payOnline,t.scale,t.decimal_place decimalPlace,t.units,t.b_id bId,
+ td1.name feeTypeCdName,td2.name feeFlagName,td3.name billTypeName,td4.name computingFormulaName,
uu.`name` userName
from business_pay_fee_config t
left join c_business cb on t.b_id = cb.b_id
left join c_orders co on cb.o_id = co.o_id
left join u_user uu on co.user_id = uu.user_id
+ left join t_dict td1 on t.fee_type_cd = td1.status_cd and td1.table_name = 'pay_fee_config' and
+ td1.table_columns = 'fee_type_cd'
+ left join t_dict td2 on t.fee_flag = td2.status_cd and td2.table_name = 'pay_fee_config' and td2.table_columns =
+ 'fee_flag'
+ left join t_dict td3 on t.bill_type = td3.status_cd and td3.table_name = 'pay_fee_config' and td3.table_columns
+ = 'bill_type'
+ left join t_dict td4 on t.computing_formula = td4.status_cd and td4.table_name = 'pay_fee_config' and
+ td4.table_columns = 'computing_formula'
where 1=1
and t.config_id = #{configId}
and t.community_id = #{communityId}
--
Gitblit v1.8.0