From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
java110-db/src/main/resources/mapper/report/ReportFeeYearCollectionServiceDaoImplMapper.xml | 53 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 39 insertions(+), 14 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/report/ReportFeeYearCollectionServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/report/ReportFeeYearCollectionServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index cdaf30b..8e2ae85
--- a/java110-db/src/main/resources/mapper/report/ReportFeeYearCollectionServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/report/ReportFeeYearCollectionServiceDaoImplMapper.xml
@@ -4,7 +4,6 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="reportFeeYearCollectionServiceDaoImpl">
-
<!-- 淇濆瓨璐圭敤骞存敹璐逛俊鎭� add by wuxw 2018-07-03 -->
<insert id="saveReportFeeYearCollectionInfo" parameterType="Map">
insert into report_fee_year_collection(
@@ -20,10 +19,13 @@
builtUpArea,t.owner_name,t.owner_name ownerName,t.config_id,t.config_id configId,t.obj_id,t.obj_id
objId,t.fee_name,t.fee_name feeName,t.community_id,t.community_id communityId,t.collection_id,t.collection_id
collectionId,t.obj_type,t.obj_type objType,rd.collection_year collectionYear,rd.receivable_amount receivableAmount,
- rd.relation_year relationYear
+ rd.relation_year relationYear,rd.received_amount receivedAmount,pfc.fee_type_cd feeTypeCd,td.name feeTypeCdName
from report_fee_year_collection t
+ inner join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
left join report_fee_year_collection_detail rd on t.collection_id = rd.collection_id and rd.status_cd = '0' and rd.community_id = t.community_id
- where 1 =1
+ left join pay_fee_config pfc on t.config_id = pfc.config_id and pfc.status_cd = '0'
+ left join t_dict td on td.status_cd = pfc.fee_type_cd and td.table_name = 'pay_fee_config' and td.table_columns = 'fee_type_cd'
+ where 1 = 1 and rd.receivable_amount >= 0 and rd.received_amount >= 0
<if test="ownerLink !=null and ownerLink != ''">
and t.owner_link= #{ownerLink}
</if>
@@ -63,19 +65,25 @@
<if test="objType !=null and objType != ''">
and t.obj_type= #{objType}
</if>
- order by rd.collectionYear
-
+ <if test="feeTypeCd !=null and feeTypeCd != ''">
+ and pfc.fee_type_cd= #{feeTypeCd}
+ </if>
+ order by rd.relation_year
</select>
<!-- 鏌ヨ璐圭敤骞存敹璐逛俊鎭� add by wuxw 2018-07-03 -->
<select id="getReportFeeYearCollectionInfo" parameterType="Map" resultType="Map">
- select t.owner_link,t.owner_link ownerLink,t.status_cd,t.status_cd statusCd,t.obj_name,t.obj_name
+ select DISTINCT t.owner_link,t.owner_link ownerLink,t.status_cd,t.status_cd statusCd,t.obj_name,t.obj_name
objName,t.owner_id,t.owner_id ownerId,t.fee_id,t.fee_id feeId,t.built_up_area,t.built_up_area
builtUpArea,t.owner_name,t.owner_name ownerName,t.config_id,t.config_id configId,t.obj_id,t.obj_id
objId,t.fee_name,t.fee_name feeName,t.community_id,t.community_id communityId,t.collection_id,t.collection_id
- collectionId,t.obj_type,t.obj_type objType
+ collectionId,t.obj_type,t.obj_type objType,pfc.fee_type_cd feeTypeCd,td.name feeTypeCdName
from report_fee_year_collection t
- where 1 =1
+ inner join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
+ left join pay_fee_config pfc on t.config_id = pfc.config_id and pfc.status_cd = '0'
+ left join t_dict td on td.status_cd = pfc.fee_type_cd and td.table_name = 'pay_fee_config' and td.table_columns = 'fee_type_cd'
+ left join report_fee_year_collection_detail rd on t.collection_id = rd.collection_id and rd.status_cd = '0' and rd.community_id = t.community_id
+ where 1 = 1 and rd.receivable_amount >= 0 and rd.received_amount >= 0
<if test="ownerLink !=null and ownerLink != ''">
and t.owner_link= #{ownerLink}
</if>
@@ -114,14 +122,15 @@
</if>
<if test="objType !=null and objType != ''">
and t.obj_type= #{objType}
+ </if>
+ <if test="feeTypeCd !=null and feeTypeCd != ''">
+ and pfc.fee_type_cd= #{feeTypeCd}
</if>
order by t.create_time desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
-
</select>
-
<!-- 淇敼璐圭敤骞存敹璐逛俊鎭� add by wuxw 2018-07-03 -->
<update id="updateReportFeeYearCollectionInfo" parameterType="Map">
@@ -169,11 +178,29 @@
</update>
+ <update id="deleteReportFeeYearCollectionInfo" parameterType="Map">
+ update report_fee_year_collection t set t.status_cd = '1'
+ where 1=1
+ <if test="feeId !=null and feeId != ''">
+ and t.fee_id= #{feeId}
+ </if>
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
+ <if test="collectionId !=null and collectionId != ''">
+ and t.collection_id= #{collectionId}
+ </if>
+
+ </update>
+
<!-- 鏌ヨ璐圭敤骞存敹璐规暟閲� add by wuxw 2018-07-03 -->
<select id="queryReportFeeYearCollectionsCount" parameterType="Map" resultType="Map">
- select count(1) count
+ select count(DISTINCT t.collection_id) count
from report_fee_year_collection t
- where 1 =1
+ inner join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
+ left join report_fee_year_collection_detail rd on t.collection_id = rd.collection_id and rd.status_cd = '0' and rd.community_id = t.community_id
+ left join pay_fee_config pfc on t.config_id = pfc.config_id and pfc.status_cd = '0'
+ where 1 = 1 and rd.receivable_amount >= 0 and rd.received_amount >= 0
<if test="ownerLink !=null and ownerLink != ''">
and t.owner_link= #{ownerLink}
</if>
@@ -213,8 +240,6 @@
<if test="objType !=null and objType != ''">
and t.obj_type= #{objType}
</if>
-
-
</select>
</mapper>
--
Gitblit v1.8.0