From cd3107ad63c0bf8d17d71962385c05c7f4a68419 Mon Sep 17 00:00:00 2001
From: chengf <2156125618@qq.com>
Date: 星期四, 31 七月 2025 18:42:12 +0800
Subject: [PATCH] 停车道闸系统与物业管理系统接口设计的入口车辆识别接口2025/07/31

---
 java110-db/src/main/resources/mapper/fee/ImportFeeDetailServiceDaoImplMapper.xml |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/fee/ImportFeeDetailServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/ImportFeeDetailServiceDaoImplMapper.xml
index 9ff5713..fc0665b 100755
--- a/java110-db/src/main/resources/mapper/fee/ImportFeeDetailServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/ImportFeeDetailServiceDaoImplMapper.xml
@@ -9,10 +9,12 @@
     <insert id="saveImportFeeDetailInfo" parameterType="Map">
         insert into import_fee_detail(
         amount,unit_num,fee_id,floor_num,room_id,room_num,ifd_id,fee_name,start_time,
-        end_time,state,community_id,import_fee_id,remark,obj_id,obj_name,obj_type
+        end_time,state,community_id,import_fee_id,remark,obj_id,obj_name,obj_type,expense_subject
         ) values (
-        #{amount},#{unitNum},#{feeId},#{floorNum},#{roomId},#{roomNum},#{ifdId},#{feeName},#{startTime},
-        #{endTime},#{state},#{communityId},#{importFeeId},#{remark},#{objId},#{objName},#{objType}
+        <if test="amount == null">0,</if>
+        <if test="amount != null">#{amount},</if>
+        #{unitNum},#{feeId},#{floorNum},#{roomId},#{roomNum},#{ifdId},#{feeName},#{startTime},
+        #{endTime},#{state},#{communityId},#{importFeeId},#{remark},#{objId},#{objName},#{objType},#{expenseSubject}
         )
     </insert>
 
@@ -23,8 +25,11 @@
         feeId,t.floor_num,t.floor_num floorNum,t.room_id,t.room_id roomId,t.room_num,t.room_num
         roomNum,t.ifd_id,t.ifd_id ifdId,t.fee_name,t.fee_name feeName,t.start_time,t.start_time
         startTime,t.end_time,t.end_time endTime,t.state,t.community_id,t.community_id communityId,
-        t.remark,t.obj_id objId,t.obj_name objName,t.obj_type objType
+        t.remark,t.obj_id objId,t.obj_name objName,t.obj_type objType,imf.create_time createTime,
+        td.description,t.expense_subject expenseSubject
         from import_fee_detail t
+        left join import_fee imf on imf.import_fee_id = t.import_fee_id
+        left join `t_dict` td on imf.fee_type_cd = td.status_cd and td.table_columns = "fee_type_cd"
         where 1 =1
         <if test="amount !=null and amount != ''">
             and t.amount= #{amount}
@@ -206,12 +211,14 @@
     <insert id="saveImportFeeDetails" parameterType="Map">
         insert into import_fee_detail(
         amount,unit_num,fee_id,floor_num,room_id,room_num,ifd_id,fee_name,start_time,
-        end_time,state,community_id,import_fee_id,remark,obj_id,obj_name,obj_type
+        end_time,state,community_id,import_fee_id,remark,obj_id,obj_name,obj_type,expense_subject
         ) values
         <foreach collection="importFeeDetailPos" item="item" separator=",">
-          (#{item.amount},#{item.unitNum},#{item.feeId},#{item.floorNum},#{item.roomId},#{item.roomNum},#{item.ifdId},#{item.feeName},
+          ( <if test="item.amount == null">0</if>
+            <if test="item.amount != null">#{item.amount}</if>
+           ,#{item.unitNum},#{item.feeId},#{item.floorNum},#{item.roomId},#{item.roomNum},#{item.ifdId},#{item.feeName},
             #{item.startTime},#{item.endTime},#{item.state},#{item.communityId},#{item.importFeeId},#{item.remark},
-            #{item.objId},#{item.objName},#{item.objType})
+            #{item.objId},#{item.objName},#{item.objType},#{item.expenseSubject})
         </foreach>
     </insert>
 

--
Gitblit v1.8.0