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/FeeAttrServiceDaoImplMapper.xml | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/fee/FeeAttrServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/FeeAttrServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index 81c72c1..5f092f1
--- a/java110-db/src/main/resources/mapper/fee/FeeAttrServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/FeeAttrServiceDaoImplMapper.xml
@@ -76,8 +76,10 @@
<!-- 鏌ヨ璐圭敤灞炴�т俊鎭� add by wuxw 2018-07-03 -->
<select id="getFeeAttrInfo" parameterType="Map" resultType="Map">
select t.attr_id,t.attr_id attrId,t.spec_cd,t.spec_cd specCd,t.status_cd,t.status_cd
- statusCd,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.fee_id,t.fee_id feeId,t.value
+ statusCd,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.fee_id,t.fee_id feeId,t.value,
+ td.name specCdName
from pay_fee_attrs t
+ left join t_dict td on t.spec_cd = td.status_cd and td.table_name = 'pay_fee_attrs' and td.table_columns = 'spec_cd'
where 1 =1
<if test="attrId !=null and attrId != ''">
and t.attr_id= #{attrId}
@@ -97,6 +99,12 @@
<if test="feeId !=null and feeId != ''">
and t.fee_id= #{feeId}
</if>
+ <if test="feeIds !=null">
+ and t.fee_id in
+ <foreach collection="feeIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
<if test="value !=null and value != ''">
and t.value= #{value}
</if>
@@ -113,15 +121,6 @@
<if test="newBId != null and newBId != ''">
,t.b_id = #{newBId}
</if>
- <if test="specCd !=null and specCd != ''">
- , t.spec_cd= #{specCd}
- </if>
- <if test="communityId !=null and communityId != ''">
- , t.community_id= #{communityId}
- </if>
- <if test="feeId !=null and feeId != ''">
- , t.fee_id= #{feeId}
- </if>
<if test="value !=null and value != ''">
, t.value= #{value}
</if>
@@ -131,6 +130,15 @@
</if>
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
+ </if>
+ <if test="specCd !=null and specCd != ''">
+ and t.spec_cd= #{specCd}
+ </if>
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
+ <if test="feeId !=null and feeId != ''">
+ and t.fee_id= #{feeId}
</if>
</update>
@@ -170,7 +178,7 @@
<!-- 鎵归噺鎻掑叆璐圭敤 -->
<insert id="saveFeeAttrs" parameterType="Map">
- insert into pay_fee_attrs (attr_id,operate,spec_cd,community_id,b_id,fee_id,value)
+ insert into pay_fee_attrs (attr_id,status_cd,spec_cd,community_id,b_id,fee_id,value)
VALUES
<foreach collection="feeAttrPos" item="item" separator=",">
(#{item.attrId},'0',#{item.specCd},#{item.communityId},'-1',#{item.feeId},#{item.value})
--
Gitblit v1.8.0