优化代码

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

@@ -759,7 +759,7 @@
     <!-- 查询房屋费用明细表-->
     <select id="getObjFeeSummary" parameterType="Map" resultType="Map">
         select
-        a.obj_id objId,pfc.fee_type_cd feeTypeCd,
+        a.obj_id objId,a.fee_type_cd feeTypeCd,
         (
         select ifnull(sum(t.receivable_amount),0.0) hisOweFee
         from pay_fee_detail_month t
@@ -778,17 +778,16 @@
         where pf.payer_obj_id = a.obj_id
         and t.status_cd = '0'
         and t.community_id= a.community_id
-        and pfc1.fee_type_cd = pfc.fee_type_cd
+        and pfc1.fee_type_cd = a.fee_type_cd
         and t.create_time &gt; #{startDate}
         and t.create_time &lt; #{endDate}
         ) receivedFee
         from pay_fee_detail_month a
-        inner join pay_fee_config pfc on a.config_id = pfc.config_id and pfc.status_cd = '0'
         where a.obj_id in
         <foreach collection="objIds" item="item" index="index" open="(" close=")" separator=",">
             #{item}
         </foreach>
-        group by a.obj_id,pfc.fee_type_cd,a.community_id
+        group by a.obj_id,a.fee_type_cd,a.community_id
     </select>
 
     <!-- 查询业主费用明细表 -->

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

@@ -78,7 +78,7 @@
         where
         1=1
         and t.status_cd = '0'
-        and t.community_id= a.community_id
+        and t.community_id= #{communityId}
         and t.create_time > #{startDate}
         and t.create_time < #{endDate}
         and bu.floor_id in
@@ -107,7 +107,7 @@
             #{item}
         </foreach>
         and t.status_cd = '0'
-        and t.community_id= a.community_id
+        and t.community_id= #{communityId}
         and t.pay_fee_time &gt; #{startDate}
         and t.pay_fee_time &lt; #{endDate}
         and t.cur_month_time &gt;= #{endDate}
@@ -133,7 +133,7 @@
             #{item}
         </foreach>
         and t.status_cd = '0'
-        and t.community_id= a.community_id
+        and t.community_id= #{communityId}
         and t.detail_id = '-1'
         and t.cur_month_time &lt; #{startDate}
         <if test="configIds !=null ">
@@ -158,7 +158,7 @@
             #{item}
         </foreach>
         and t.status_cd = '0'
-        and t.community_id= a.community_id
+        and t.community_id= #{communityId}
         and t.cur_month_time &gt;= #{startDate}
         and t.cur_month_time &lt; #{endDate}
         <if test="configIds !=null ">
@@ -183,7 +183,7 @@
             #{item}
         </foreach>
         and t.status_cd = '0'
-        and t.community_id= a.community_id
+        and t.community_id= #{communityId}
         and t.cur_month_time &gt;= #{startDate}
         and t.cur_month_time &lt; #{endDate}
         and t.detail_id != '-1'
@@ -209,7 +209,7 @@
             #{item}
         </foreach>
         and t.status_cd = '0'
-        and t.community_id= a.community_id
+        and t.community_id= #{communityId}
         and t.pay_fee_time &gt; #{startDate}
         and t.pay_fee_time &lt; #{endDate}
         and t.cur_month_time &lt; #{startDate}

service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFeeSummaryCmd.java

@@ -80,7 +80,7 @@ public class QueryReportFeeSummaryCmd extends Cmd {
 
         Java110ThreadPoolFactory java110ThreadPoolFactory = null;
         try {
-            java110ThreadPoolFactory = Java110ThreadPoolFactory.getInstance().createThreadPool(9);
+            java110ThreadPoolFactory = Java110ThreadPoolFactory.getInstance().createThreadPool(7);
             java110ThreadPoolFactory.submit(() -> {
                 //todo 查询历史欠费
                 double hisOweFee = feeStatisticsImpl.getHisMonthOweFee(queryStatisticsDto);
@@ -127,15 +127,9 @@ public class QueryReportFeeSummaryCmd extends Cmd {
                 //todo 房屋数
                 long roomCount = baseDataStatisticsImpl.getRoomCount(queryStatisticsDto);
                 data.put("roomCount", roomCount);
-                return roomCount;
-            });
-            java110ThreadPoolFactory.submit(() -> {
                 //todo 收费房屋数
                 long feeRoomCount = feeStatisticsImpl.getFeeRoomCount(queryStatisticsDto);
                 data.put("feeRoomCount", feeRoomCount);
-                return feeRoomCount;
-            });
-            java110ThreadPoolFactory.submit(() -> {
                 //todo 欠费户数
                 int oweRoomCount = feeStatisticsImpl.getOweRoomCount(queryStatisticsDto);
                 data.put("oweRoomCount", oweRoomCount);