From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/fee/PayFeeAuditServiceDaoImplMapper.xml | 69 ++++++++++++++++++++--------------
1 files changed, 41 insertions(+), 28 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/fee/PayFeeAuditServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/PayFeeAuditServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index ed7f0ad..d80bf24
--- a/java110-db/src/main/resources/mapper/fee/PayFeeAuditServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/PayFeeAuditServiceDaoImplMapper.xml
@@ -1,34 +1,33 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="payFeeAuditServiceDaoImpl">
-
<!-- 淇濆瓨缂磋垂瀹℃牳淇℃伅 add by wuxw 2018-07-03 -->
<insert id="savePayFeeAuditInfo" parameterType="Map">
- insert into pay_fee_audit(
- audit_user_id,audit_user_name,fee_detail_id,state,message,community_id,fee_id,audit_id
- ) values (
- #{auditUserId},#{auditUserName},#{feeDetailId},#{state},#{message},#{communityId},#{feeId},#{auditId}
- )
+ insert into pay_fee_audit(audit_user_id, audit_user_name, fee_detail_id, state, message, community_id, fee_id,
+ audit_id)
+ values (#{auditUserId}, #{auditUserName}, #{feeDetailId}, #{state}, #{message}, #{communityId}, #{feeId},
+ #{auditId})
</insert>
-
<!-- 鏌ヨ缂磋垂瀹℃牳淇℃伅 add by wuxw 2018-07-03 -->
<select id="getPayFeeAuditInfo" parameterType="Map" resultType="Map">
select pf.payer_obj_id payerObjId,pf.payer_obj_type payerObjType,pfc.fee_name feeName,
pfd.cycles,pfd.start_time startTime,pfd.end_time endTime,pfd.receivable_amount receivableAmount,
pfd.received_amount receivedAmount,pfd.create_time createTime,pfa.state,pfa.message,pfd.remark,
- pfa.audit_user_name auditUserName,pfd.b_id bId,pf.fee_id feeId,pf.community_id communityId
+ pfa.audit_user_name auditUserName,pfd.b_id bId,pf.fee_id feeId,pf.community_id communityId,pfd.detail_id
+ detailId
from pay_fee_detail pfd
INNER JOIN pay_fee pf on pf.fee_id = pfd.fee_id and pf.community_id = pfd.community_id and pf.status_cd = '0'
- inner join pay_fee_config pfc on pf.config_id = pfc.config_id and pf.community_id = pfc.community_id and pfc.status_cd = '0'
- left join pay_fee_audit pfa on pf.fee_id = pfa.fee_id and pfd.detail_id = pfa.fee_detail_id and pfa.status_cd = '0'
+ inner join pay_fee_config pfc on pf.config_id = pfc.config_id and pf.community_id = pfc.community_id and
+ pfc.status_cd = '0'
+ left join pay_fee_audit pfa on pf.fee_id = pfa.fee_id and pfd.detail_id = pfa.fee_detail_id and pfa.status_cd =
+ '0'
where 1=1
and pfd.community_id = #{communityId}
- and pfd.status_cd = '0'
- and pfd.state not in ('1000','1100','1200','1300')
+ and pfd.status_cd = '0'
+ and pfd.state = '1400'
<if test="roomId !=null and roomId != ''">
and pf.payer_obj_id = #{roomId}
and pf.payer_obj_type = '3333'
@@ -37,17 +36,23 @@
and pf.payer_obj_id = #{carId}
and pf.payer_obj_type = '6666'
</if>
- <if test="state !=null and state != ''">
- and (pfa.state is null
- or pfa.state = #{state})
+ <if test="payerObjId !=null and payerObjId != ''">
+ and pf.payer_obj_id = #{payerObjId}
+ </if>
+ <if test="payerObjType !=null and payerObjType != ''">
+ and pf.payer_obj_type = #{payerObjType}
+ </if>
+ <if test="state != null and state != '' and state != '1010'">
+ and pfa.state = #{state}
+ </if>
+ <if test="state != null and state != '' and state == '1010'">
+ and pfa.state is null
</if>
ORDER BY pfd.create_time desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
-
</select>
-
<!-- 淇敼缂磋垂瀹℃牳淇℃伅 add by wuxw 2018-07-03 -->
<update id="updatePayFeeAuditInfo" parameterType="Map">
@@ -87,11 +92,14 @@
select count(1) count
from pay_fee_detail pfd
INNER JOIN pay_fee pf on pf.fee_id = pfd.fee_id and pf.community_id = pfd.community_id and pf.status_cd = '0'
- inner join pay_fee_config pfc on pf.config_id = pfc.config_id and pf.community_id = pfc.community_id and pfc.status_cd = '0'
- left join pay_fee_audit pfa on pf.fee_id = pfa.fee_id and pfd.detail_id = pfa.fee_detail_id and pfa.status_cd = '0'
+ inner join pay_fee_config pfc on pf.config_id = pfc.config_id and pf.community_id = pfc.community_id and
+ pfc.status_cd = '0'
+ left join pay_fee_audit pfa on pf.fee_id = pfa.fee_id and pfd.detail_id = pfa.fee_detail_id and pfa.status_cd =
+ '0'
where 1=1
and pfd.community_id = #{communityId}
- and pfd.status_cd = '0'
+ and pfd.status_cd = '0'
+ and pfd.state = '1400'
<if test="roomId !=null and roomId != ''">
and pf.payer_obj_id = #{roomId}
and pf.payer_obj_type = '3333'
@@ -100,12 +108,17 @@
and pf.payer_obj_id = #{carId}
and pf.payer_obj_type = '6666'
</if>
- <if test="state !=null and state != ''">
- and (pfa.state is null
- or pfa.state = #{state})
+ <if test="payerObjId !=null and payerObjId != ''">
+ and pf.payer_obj_id = #{payerObjId}
</if>
-
-
+ <if test="payerObjType !=null and payerObjType != ''">
+ and pf.payer_obj_type = #{payerObjType}
+ </if>
+ <if test="state != null and state != '' and state != '1010'">
+ and pfa.state = #{state}
+ </if>
+ <if test="state != null and state != '' and state == '1010'">
+ and pfa.state is null
+ </if>
</select>
-
</mapper>
--
Gitblit v1.8.0