From f29e6f31e4f2d533124fc68346b7cc072f427c9b Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期四, 11 十二月 2025 16:58:24 +0800
Subject: [PATCH] Z三导入逻辑

---
 java110-db/src/main/resources/mapper/fee/ImportFeeServiceDaoImplMapper.xml |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/fee/ImportFeeServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/ImportFeeServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index 2fdeb70..17b220b
--- a/java110-db/src/main/resources/mapper/fee/ImportFeeServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/ImportFeeServiceDaoImplMapper.xml
@@ -17,9 +17,10 @@
 
     <!-- 鏌ヨ璐圭敤瀵煎叆淇℃伅 add by wuxw 2018-07-03 -->
     <select id="getImportFeeInfo" parameterType="Map" resultType="Map">
-        select t.fee_type_cd,t.fee_type_cd feeTypeCd,t.status_cd,t.status_cd statusCd,t.import_fee_id,t.import_fee_id
-        importFeeId,t.community_id,t.community_id communityId,t.create_time createTime,d.name feeTypeCdName,remark
+        select t.fee_type_cd,t.fee_type_cd feeTypeCd,t.secondary_fee_type_cd,t.secondary_fee_type_cd secondaryFeeTypeCd,s.secondary_fee_type_cd_name,s.secondary_fee_type_cd_name secondaryFeeTypeCdName,t.status_cd,t.status_cd statusCd,t.import_fee_id,t.import_fee_id
+        importFeeId,t.community_id,t.community_id communityId,t.create_time createTime,d.name feeTypeCdName,remark, t.import_file_name, t.import_file_name importFileName
         from import_fee t
+        left join secondary_fee_type_cd_tb s on s.secondary_fee_type_cd = t.secondary_fee_type_cd
         left join t_dict d on t.fee_type_cd = d.status_cd and d.table_name = 'pay_fee_config' and d.table_columns = 'fee_type_cd'
         where 1 =1
         <if test="feeTypeCd !=null and feeTypeCd != ''">
@@ -51,6 +52,9 @@
         <if test="feeTypeCd !=null and feeTypeCd != ''">
             , t.fee_type_cd= #{feeTypeCd}
         </if>
+        <if test="secondaryFeeTypeCd !=null and secondaryFeeTypeCd != ''">
+            , t.secondary_fee_type_cd= #{secondaryFeeTypeCd}
+        </if>
         <if test="communityId !=null and communityId != ''">
             , t.community_id= #{communityId}
         </if>
@@ -65,6 +69,7 @@
     <select id="queryImportFeesCount" parameterType="Map" resultType="Map">
         select count(1) count
         from import_fee t
+        left join t_dict d on t.fee_type_cd = d.status_cd and d.table_name = 'pay_fee_config' and d.table_columns = 'fee_type_cd'
         where 1 =1
         <if test="feeTypeCd !=null and feeTypeCd != ''">
             and t.fee_type_cd= #{feeTypeCd}

--
Gitblit v1.8.0