From 3b1be358f4d8709d53901d9e16d4d1552b2d0b4f Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期六, 17 七月 2021 23:07:46 +0800
Subject: [PATCH] 合并远程分支，并处理冲突
---
java110-db/src/main/resources/mapper/report/ReportOweFeeServiceDaoImplMapper.xml | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/report/ReportOweFeeServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/report/ReportOweFeeServiceDaoImplMapper.xml
index 078b3d4..91d0abe 100644
--- a/java110-db/src/main/resources/mapper/report/ReportOweFeeServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/report/ReportOweFeeServiceDaoImplMapper.xml
@@ -73,7 +73,7 @@
<if test="payerObjId !=null and payerObjId != ''">
and t.payer_obj_id= #{payerObjId}
</if>
- order by t.create_time desc
+ order by t.payer_obj_name
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
@@ -84,9 +84,6 @@
<update id="updateReportOweFeeInfo" parameterType="Map">
update report_owe_fee t
<set>
- <if test="newBId != null and newBId != ''">
- t.b_id = #{newBId},
- </if>
<if test="configName !=null and configName != ''">
t.config_name= #{configName},
</if>
@@ -134,7 +131,26 @@
</if>
</set>
where 1=1
- and t.owe_id= #{oweId}
+ and t.owe_id= #{oweId}
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
+ </update>
+
+
+ <!-- 淇敼娆犺垂缁熻淇℃伅 add by wuxw 2018-07-03 -->
+ <update id="deleteReportOweFeeInfo" parameterType="Map">
+ delete from report_owe_fee
+ where 1=1
+ <if test="oweId !=null and oweId != ''">
+ and owe_id= #{oweId}
+ </if>
+ <if test="feeId !=null and feeId != ''">
+ and fee_id = #{feeId}
+ </if>
+ <if test="communityId !=null and communityId != ''">
+ and community_id= #{communityId}
+ </if>
</update>
<!-- 鏌ヨ娆犺垂缁熻鏁伴噺 add by wuxw 2018-07-03 -->
@@ -270,7 +286,7 @@
#{item}
</foreach>
</if>
- order by t.create_time desc
+ order by t.payer_obj_name
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
--
Gitblit v1.8.0