优化报表专家数据重复问题

java110-db/src/main/resources/mapper/report/ReportFeeYearCollectionServiceDaoImplMapper.xml

@@ -73,7 +73,7 @@
 
     <!-- 查询费用年收费信息 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
@@ -180,7 +180,7 @@
 
     <!-- 查询费用年收费数量 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
         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

service-report/src/main/java/com/java110/report/smo/impl/ReportFeeYearCollectionInnerServiceSMOImpl.java

@@ -144,6 +144,7 @@ public class ReportFeeYearCollectionInnerServiceSMOImpl extends BaseServiceSMO i
                 = reportFeeYearCollectionDetailInnerServiceSMOImpl.queryReportFeeYearCollectionDetails(reportFeeYearCollectionDetailDto);
 
         List<ReportFeeYearCollectionDetailDto> tmpReportFeeYearCollectionDetailDtos = null;
+        //循环 主表
         for (ReportFeeYearCollectionDto reportFeeYearCollectionDto : reportFeeYearCollections) {
             tmpReportFeeYearCollectionDetailDtos = new ArrayList<>();
             for (ReportFeeYearCollectionDetailDto tmpReportFeeYearCollectionDetailDto : reportFeeYearCollectionDetailDtos) {