From 1ac555ce49a45e2c7fc015dbb16b104840788c21 Mon Sep 17 00:00:00 2001
From: chengf <2156125618@qq.com>
Date: 星期一, 18 八月 2025 11:51:42 +0800
Subject: [PATCH] 费用导入修复2025/08/15

---
 java110-db/src/main/resources/mapper/fee/FeeServiceDaoImplMapper.xml |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/fee/FeeServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/FeeServiceDaoImplMapper.xml
index ad428f5..6accdc4 100755
--- a/java110-db/src/main/resources/mapper/fee/FeeServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/FeeServiceDaoImplMapper.xml
@@ -404,13 +404,6 @@
             and pfc.community_id in (#{communityId},'9999')
         </if>
 
-        <if test="isContractFee != null">
-            and is_contract_fee = #{isContractFee}
-        </if>
-        <if test="isContractFee == null">
-            and is_contract_fee IS NULL
-        </if>
-
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
         </if>
@@ -848,11 +841,19 @@
     <!-- 鎵归噺鎻掑叆璐圭敤 -->
     <insert id="insertFees" parameterType="Map">
         insert into pay_fee (amount,status_cd,income_obj_id,fee_type_cd,secondary_fee_type_cd,start_time,end_time,community_id,b_id,fee_id,
-        user_id,payer_obj_id,fee_flag,state,config_id,payer_obj_type,batch_id,is_contract_fee,contract_fee)
+        user_id,payer_obj_id,fee_flag,state,config_id,payer_obj_type,batch_id,is_contract_fee,contract_fee,create_time)
         VALUES
         <foreach collection="payFeePos" item="item" separator=",">
             (#{item.amount},'0',#{item.incomeObjId},#{item.feeTypeCd},#{item.secondaryFeeTypeCd},#{item.startTime},#{item.endTime},#{item.communityId},
-            '-1',#{item.feeId},#{item.userId},#{item.payerObjId},#{item.feeFlag},#{item.state},#{item.configId},#{item.payerObjType},#{item.batchId},#{item.isContractFee},#{item.contractFee})
+            '-1',#{item.feeId},#{item.userId},#{item.payerObjId},#{item.feeFlag},#{item.state},#{item.configId},#{item.payerObjType},#{item.batchId},#{item.isContractFee},#{item.contractFee}
+
+            <if test="item.createTime != null and item.createTime != ''">
+                ,#{item.createTime}
+            </if>
+            <if test="item.createTime == null or item.createTime == ''">
+                ,now()
+            </if>
+            )
         </foreach>
     </insert>
 

--
Gitblit v1.8.0