From db689e5e2cb730b2cf08796fa224084f00758a71 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 12 三月 2022 17:05:17 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/fee/ImportFeeDetailServiceDaoImplMapper.xml | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/fee/ImportFeeDetailServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/ImportFeeDetailServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index 380b4eb..8abe6e9
--- a/java110-db/src/main/resources/mapper/fee/ImportFeeDetailServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/ImportFeeDetailServiceDaoImplMapper.xml
@@ -8,9 +8,11 @@
<!-- 淇濆瓨璐圭敤瀵煎叆鏄庣粏淇℃伅 add by wuxw 2018-07-03 -->
<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
+ 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
) values (
- #{amount},#{unitNum},#{feeId},#{floorNum},#{roomId},#{roomNum},#{ifdId},#{feeName},#{startTime},#{endTime},#{state},#{communityId},#{importFeeId}
+ #{amount},#{unitNum},#{feeId},#{floorNum},#{roomId},#{roomNum},#{ifdId},#{feeName},#{startTime},
+ #{endTime},#{state},#{communityId},#{importFeeId},#{remark},#{objId},#{objName},#{objType}
)
</insert>
@@ -20,7 +22,8 @@
select t.amount,t.unit_num,t.unit_num unitNum,t.status_cd,t.status_cd statusCd,t.fee_id,t.fee_id
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
+ 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
from import_fee_detail t
where 1 =1
<if test="amount !=null and amount != ''">
@@ -64,6 +67,15 @@
</if>
<if test="importFeeId !=null and importFeeId != ''">
and t.import_fee_id= #{importFeeId}
+ </if>
+ <if test="objId !=null and objId != ''">
+ and t.obj_id= #{objId}
+ </if>
+ <if test="objName !=null and objName != ''">
+ and t.obj_name= #{objName}
+ </if>
+ <if test="objType !=null and objType != ''">
+ and t.obj_type= #{objType}
</if>
order by t.create_time desc
<if test="page != -1 and page != null ">
@@ -166,6 +178,15 @@
<if test="importFeeId !=null and importFeeId != ''">
and t.import_fee_id= #{importFeeId}
</if>
+ <if test="objId !=null and objId != ''">
+ and t.obj_id= #{objId}
+ </if>
+ <if test="objName !=null and objName != ''">
+ and t.obj_name= #{objName}
+ </if>
+ <if test="objType !=null and objType != ''">
+ and t.obj_type= #{objType}
+ </if>
</select>
@@ -175,11 +196,13 @@
<!-- 鎵归噺鎻掑叆璐圭敤 -->
<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
+ 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
) values
<foreach collection="importFeeDetailPos" item="item" separator=",">
(#{item.amount},#{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.startTime},#{item.endTime},#{item.state},#{item.communityId},#{item.importFeeId},#{item.remark},
+ #{item.objId},#{item.objName},#{item.objType})
</foreach>
</insert>
--
Gitblit v1.8.0