From f42983b35c738a28ed4b9d1732d1045c5f2a19bb Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期日, 09 五月 2021 16:57:12 +0800
Subject: [PATCH] 优化代码

---
 java110-db/src/main/resources/mapper/report/ReportFeeYearCollectionServiceDaoImplMapper.xml |  331 ++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 192 insertions(+), 139 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 56744a4..825d670
--- a/java110-db/src/main/resources/mapper/report/ReportFeeYearCollectionServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/report/ReportFeeYearCollectionServiceDaoImplMapper.xml
@@ -5,165 +5,218 @@
 <mapper namespace="reportFeeYearCollectionServiceDaoImpl">
 
 
-
-
-
     <!-- 淇濆瓨璐圭敤骞存敹璐逛俊鎭� add by wuxw 2018-07-03 -->
     <insert id="saveReportFeeYearCollectionInfo" parameterType="Map">
         insert into report_fee_year_collection(
-owner_link,obj_name,owner_id,fee_id,built_up_area,owner_name,config_id,obj_id,fee_name,community_id,collection_id,obj_type
-) values (
-#{ownerLink},#{objName},#{ownerId},#{feeId},#{builtUpArea},#{ownerName},#{configId},#{objId},#{feeName},#{communityId},#{collectionId},#{objType}
-)
+        owner_link,obj_name,owner_id,fee_id,built_up_area,owner_name,config_id,obj_id,fee_name,community_id,collection_id,obj_type
+        ) values (
+        #{ownerLink},#{objName},#{ownerId},#{feeId},#{builtUpArea},#{ownerName},#{configId},#{objId},#{feeName},#{communityId},#{collectionId},#{objType}
+        )
     </insert>
 
+    <select id="getReportFeeYearCollectionInfos" 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
+        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,rd.collection_year collectionYear,rd.receivable_amount receivableAmount,
+        rd.relation_year relationYear,rd.received_amount receivedAmount
+        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
+        <if test="ownerLink !=null and ownerLink != ''">
+            and t.owner_link= #{ownerLink}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="objName !=null and objName != ''">
+            and t.obj_name= #{objName}
+        </if>
+        <if test="ownerId !=null and ownerId != ''">
+            and t.owner_id= #{ownerId}
+        </if>
+        <if test="feeId !=null and feeId != ''">
+            and t.fee_id= #{feeId}
+        </if>
+        <if test="builtUpArea !=null and builtUpArea != ''">
+            and t.built_up_area= #{builtUpArea}
+        </if>
+        <if test="ownerName !=null and ownerName != ''">
+            and t.owner_name= #{ownerName}
+        </if>
+        <if test="configId !=null and configId != ''">
+            and t.config_id= #{configId}
+        </if>
+        <if test="objId !=null and objId != ''">
+            and t.obj_id= #{objId}
+        </if>
+        <if test="feeName !=null and feeName != ''">
+            and t.fee_name= #{feeName}
+        </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>
+        <if test="objType !=null and objType != ''">
+            and t.obj_type= #{objType}
+        </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 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 
-from report_fee_year_collection t 
-where 1 =1 
-<if test="ownerLink !=null and ownerLink != ''">
-   and t.owner_link= #{ownerLink}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="objName !=null and objName != ''">
-   and t.obj_name= #{objName}
-</if> 
-<if test="ownerId !=null and ownerId != ''">
-   and t.owner_id= #{ownerId}
-</if> 
-<if test="feeId !=null and feeId != ''">
-   and t.fee_id= #{feeId}
-</if> 
-<if test="builtUpArea !=null and builtUpArea != ''">
-   and t.built_up_area= #{builtUpArea}
-</if> 
-<if test="ownerName !=null and ownerName != ''">
-   and t.owner_name= #{ownerName}
-</if> 
-<if test="configId !=null and configId != ''">
-   and t.config_id= #{configId}
-</if> 
-<if test="objId !=null and objId != ''">
-   and t.obj_id= #{objId}
-</if> 
-<if test="feeName !=null and feeName != ''">
-   and t.fee_name= #{feeName}
-</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> 
-<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 ">
-   limit #{page}, #{row}
-</if> 
+        select 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
+        from report_fee_year_collection t
+        inner join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
+        where 1 =1
+        <if test="ownerLink !=null and ownerLink != ''">
+            and t.owner_link= #{ownerLink}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="objName !=null and objName != ''">
+            and t.obj_name= #{objName}
+        </if>
+        <if test="ownerId !=null and ownerId != ''">
+            and t.owner_id= #{ownerId}
+        </if>
+        <if test="feeId !=null and feeId != ''">
+            and t.fee_id= #{feeId}
+        </if>
+        <if test="builtUpArea !=null and builtUpArea != ''">
+            and t.built_up_area= #{builtUpArea}
+        </if>
+        <if test="ownerName !=null and ownerName != ''">
+            and t.owner_name= #{ownerName}
+        </if>
+        <if test="configId !=null and configId != ''">
+            and t.config_id= #{configId}
+        </if>
+        <if test="objId !=null and objId != ''">
+            and t.obj_id= #{objId}
+        </if>
+        <if test="feeName !=null and feeName != ''">
+            and t.fee_name= #{feeName}
+        </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>
+        <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 ">
+            limit #{page}, #{row}
+        </if>
 
     </select>
 
 
-
-
     <!-- 淇敼璐圭敤骞存敹璐逛俊鎭� add by wuxw 2018-07-03 -->
     <update id="updateReportFeeYearCollectionInfo" parameterType="Map">
-        update  report_fee_year_collection t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="ownerLink !=null and ownerLink != ''">
-, t.owner_link= #{ownerLink}
-</if> 
-<if test="objName !=null and objName != ''">
-, t.obj_name= #{objName}
-</if> 
-<if test="ownerId !=null and ownerId != ''">
-, t.owner_id= #{ownerId}
-</if> 
-<if test="feeId !=null and feeId != ''">
-, t.fee_id= #{feeId}
-</if> 
-<if test="builtUpArea !=null and builtUpArea != ''">
-, t.built_up_area= #{builtUpArea}
-</if> 
-<if test="ownerName !=null and ownerName != ''">
-, t.owner_name= #{ownerName}
-</if> 
-<if test="configId !=null and configId != ''">
-, t.config_id= #{configId}
-</if> 
-<if test="objId !=null and objId != ''">
-, t.obj_id= #{objId}
-</if> 
-<if test="feeName !=null and feeName != ''">
-, t.fee_name= #{feeName}
-</if> 
-<if test="communityId !=null and communityId != ''">
-, t.community_id= #{communityId}
-</if> 
-<if test="objType !=null and objType != ''">
-, t.obj_type= #{objType}
-</if> 
- where 1=1 <if test="collectionId !=null and collectionId != ''">
-and t.collection_id= #{collectionId}
-</if> 
+        update report_fee_year_collection t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="ownerLink !=null and ownerLink != ''">
+            , t.owner_link= #{ownerLink}
+        </if>
+        <if test="objName !=null and objName != ''">
+            , t.obj_name= #{objName}
+        </if>
+        <if test="ownerId !=null and ownerId != ''">
+            , t.owner_id= #{ownerId}
+        </if>
+        <if test="feeId !=null and feeId != ''">
+            , t.fee_id= #{feeId}
+        </if>
+        <if test="builtUpArea !=null and builtUpArea != ''">
+            , t.built_up_area= #{builtUpArea}
+        </if>
+        <if test="ownerName !=null and ownerName != ''">
+            , t.owner_name= #{ownerName}
+        </if>
+        <if test="configId !=null and configId != ''">
+            , t.config_id= #{configId}
+        </if>
+        <if test="objId !=null and objId != ''">
+            , t.obj_id= #{objId}
+        </if>
+        <if test="feeName !=null and feeName != ''">
+            , t.fee_name= #{feeName}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            , t.community_id= #{communityId}
+        </if>
+        <if test="objType !=null and objType != ''">
+            , t.obj_type= #{objType}
+        </if>
+        where 1=1
+        <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 
-from report_fee_year_collection t 
-where 1 =1 
-<if test="ownerLink !=null and ownerLink != ''">
-   and t.owner_link= #{ownerLink}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="objName !=null and objName != ''">
-   and t.obj_name= #{objName}
-</if> 
-<if test="ownerId !=null and ownerId != ''">
-   and t.owner_id= #{ownerId}
-</if> 
-<if test="feeId !=null and feeId != ''">
-   and t.fee_id= #{feeId}
-</if> 
-<if test="builtUpArea !=null and builtUpArea != ''">
-   and t.built_up_area= #{builtUpArea}
-</if> 
-<if test="ownerName !=null and ownerName != ''">
-   and t.owner_name= #{ownerName}
-</if> 
-<if test="configId !=null and configId != ''">
-   and t.config_id= #{configId}
-</if> 
-<if test="objId !=null and objId != ''">
-   and t.obj_id= #{objId}
-</if> 
-<if test="feeName !=null and feeName != ''">
-   and t.fee_name= #{feeName}
-</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> 
-<if test="objType !=null and objType != ''">
-   and t.obj_type= #{objType}
-</if> 
+    <select id="queryReportFeeYearCollectionsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from report_fee_year_collection t
+        where 1 =1
+        <if test="ownerLink !=null and ownerLink != ''">
+            and t.owner_link= #{ownerLink}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="objName !=null and objName != ''">
+            and t.obj_name= #{objName}
+        </if>
+        <if test="ownerId !=null and ownerId != ''">
+            and t.owner_id= #{ownerId}
+        </if>
+        <if test="feeId !=null and feeId != ''">
+            and t.fee_id= #{feeId}
+        </if>
+        <if test="builtUpArea !=null and builtUpArea != ''">
+            and t.built_up_area= #{builtUpArea}
+        </if>
+        <if test="ownerName !=null and ownerName != ''">
+            and t.owner_name= #{ownerName}
+        </if>
+        <if test="configId !=null and configId != ''">
+            and t.config_id= #{configId}
+        </if>
+        <if test="objId !=null and objId != ''">
+            and t.obj_id= #{objId}
+        </if>
+        <if test="feeName !=null and feeName != ''">
+            and t.fee_name= #{feeName}
+        </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>
+        <if test="objType !=null and objType != ''">
+            and t.obj_type= #{objType}
+        </if>
 
 
-     </select>
+    </select>
 
 </mapper>

--
Gitblit v1.8.0