optimzie

java110-bean/src/main/java/com/java110/dto/report/QueryStatisticsDto.java

@@ -16,8 +16,16 @@ public class QueryStatisticsDto implements Serializable {
 
     private String configId;
 
+    private String[] configIds;
+
     private String objName;
 
+    private String ownerName;
+
+    private String link;
+
+    private String feeTypeCd;
+
 
     public String getCommunityId() {
         return communityId;
@@ -67,4 +75,36 @@ public class QueryStatisticsDto implements Serializable {
     public void setObjName(String objName) {
         this.objName = objName;
     }
+
+    public String[] getConfigIds() {
+        return configIds;
+    }
+
+    public void setConfigIds(String[] configIds) {
+        this.configIds = configIds;
+    }
+
+    public String getOwnerName() {
+        return ownerName;
+    }
+
+    public void setOwnerName(String ownerName) {
+        this.ownerName = ownerName;
+    }
+
+    public String getLink() {
+        return link;
+    }
+
+    public void setLink(String link) {
+        this.link = link;
+    }
+
+    public String getFeeTypeCd() {
+        return feeTypeCd;
+    }
+
+    public void setFeeTypeCd(String feeTypeCd) {
+        this.feeTypeCd = feeTypeCd;
+    }
 }

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

@@ -24,6 +24,21 @@
         <if test="objName != null and objName != ''">
             and t.obj_name like concat('%',#{objName},'%')
         </if>
+        <if test="ownerName != null and ownerName != ''">
+            and t.owner_name like concat('%',#{ownerName},'%')
+        </if>
+        <if test="link != null and link != ''">
+            and t.link = #{link}
+        </if>
+        <if test="configIds !=null ">
+            and t.config_id in
+            <foreach collection="configIds" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="feeTypeCd != null and feeTypeCd != ''">
+            and pf.fee_type_cd = #{feeTypeCd}
+        </if>
         and t.status_cd = '0'
         and t.community_id= #{communityId}
         and t.cur_month_time &lt; #{startDate}
@@ -49,6 +64,21 @@
         <if test="objName != null and objName != ''">
             and t.obj_name like concat('%',#{objName},'%')
         </if>
+        <if test="ownerName != null and ownerName != ''">
+            and t.owner_name like concat('%',#{ownerName},'%')
+        </if>
+        <if test="link != null and link != ''">
+            and t.link = #{link}
+        </if>
+        <if test="configIds !=null ">
+            and t.config_id in
+            <foreach collection="configIds" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="feeTypeCd != null and feeTypeCd != ''">
+            and pf.fee_type_cd = #{feeTypeCd}
+        </if>
         and t.status_cd = '0'
         and t.community_id= #{communityId}
         and t.cur_month_time &gt; #{startDate}
@@ -76,6 +106,21 @@
         <if test="objName != null and objName != ''">
             and t.obj_name like concat('%',#{objName},'%')
         </if>
+        <if test="ownerName != null and ownerName != ''">
+            and t.owner_name like concat('%',#{ownerName},'%')
+        </if>
+        <if test="link != null and link != ''">
+            and t.link = #{link}
+        </if>
+        <if test="configIds !=null ">
+            and t.config_id in
+            <foreach collection="configIds" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="feeTypeCd != null and feeTypeCd != ''">
+            and pf.fee_type_cd = #{feeTypeCd}
+        </if>
         and t.status_cd = '0'
         and t.community_id= #{communityId}
         and t.cur_month_time &gt; #{startDate}
@@ -102,6 +147,21 @@
         <if test="objName != null and objName != ''">
             and t.obj_name like concat('%',#{objName},'%')
         </if>
+        <if test="ownerName != null and ownerName != ''">
+            and t.owner_name like concat('%',#{ownerName},'%')
+        </if>
+        <if test="link != null and link != ''">
+            and t.link = #{link}
+        </if>
+        <if test="configIds !=null ">
+            and t.config_id in
+            <foreach collection="configIds" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="feeTypeCd != null and feeTypeCd != ''">
+            and pf.fee_type_cd = #{feeTypeCd}
+        </if>
         and t.status_cd = '0'
         and t.community_id= #{communityId}
         and t.pay_fee_time &gt;  #{startDate}
@@ -129,6 +189,21 @@
         <if test="objName != null and objName != ''">
             and t.obj_name like concat('%',#{objName},'%')
         </if>
+        <if test="ownerName != null and ownerName != ''">
+            and t.owner_name like concat('%',#{ownerName},'%')
+        </if>
+        <if test="link != null and link != ''">
+            and t.link = #{link}
+        </if>
+        <if test="configIds !=null ">
+            and t.config_id in
+            <foreach collection="configIds" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="feeTypeCd != null and feeTypeCd != ''">
+            and pf.fee_type_cd = #{feeTypeCd}
+        </if>
         and t.status_cd = '0'
         and t.community_id= #{communityId}
         and t.pay_fee_time &gt;  #{startDate}
@@ -156,6 +231,21 @@
         <if test="objName != null and objName != ''">
             and t.obj_name like concat('%',#{objName},'%')
         </if>
+        <if test="ownerName != null and ownerName != ''">
+            and t.owner_name like concat('%',#{ownerName},'%')
+        </if>
+        <if test="link != null and link != ''">
+            and t.link = #{link}
+        </if>
+        <if test="configIds !=null ">
+            and t.config_id in
+            <foreach collection="configIds" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="feeTypeCd != null and feeTypeCd != ''">
+            and pf.fee_type_cd = #{feeTypeCd}
+        </if>
         and t.status_cd = '0'
         and t.community_id= #{communityId}
         and t.pay_fee_time &gt;  #{startDate}
@@ -184,6 +274,21 @@
         <if test="objName != null and objName != ''">
             and t.obj_name like concat('%',#{objName},'%')
         </if>
+        <if test="ownerName != null and ownerName != ''">
+            and t.owner_name like concat('%',#{ownerName},'%')
+        </if>
+        <if test="link != null and link != ''">
+            and t.link = #{link}
+        </if>
+        <if test="configIds !=null ">
+            and t.config_id in
+            <foreach collection="configIds" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="feeTypeCd != null and feeTypeCd != ''">
+            and pf.fee_type_cd = #{feeTypeCd}
+        </if>
         and t.status_cd = '0'
         and pf.payer_obj_type = '3333'
         and t.community_id= #{communityId}

service-job/src/main/java/com/java110/job/JobServiceApplication.java

@@ -50,6 +50,7 @@ import java.nio.charset.Charset;
         "com.java110.intf.report",
         "com.java110.intf.acct",
         "com.java110.intf.oa",
+        "com.java110.intf.dev",
         "com.java110.intf.goods"
 })
 @EnableScheduling

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

@@ -78,6 +78,10 @@ public class QueryReportFeeSummaryCmd extends Cmd {
         queryStatisticsDto.setConfigId(reqJson.getString("configId"));
         queryStatisticsDto.setFloorId(reqJson.getString("floorId"));
         queryStatisticsDto.setObjName(reqJson.getString("objName"));
+        queryStatisticsDto.setFeeTypeCd(reqJson.getString("feeTypeCd"));
+        if(reqJson.containsKey("configIds")){
+            queryStatisticsDto.setConfigIds(reqJson.getString("configIds").split(","));
+        }
 
         //todo 查询历史欠费
         double hisOweFee = feeStatisticsImpl.getHisMonthOweFee(queryStatisticsDto);
@@ -101,7 +105,7 @@ public class QueryReportFeeSummaryCmd extends Cmd {
         long roomCount = baseDataStatisticsImpl.getRoomCount(queryStatisticsDto);
 
         //todo 空闲房屋数
-        long freeRoomCount = baseDataStatisticsImpl.getFreeRoomCount(queryStatisticsDto);
+        long feeRoomCount = feeStatisticsImpl.getFeeRoomCount(queryStatisticsDto);
 
         //todo 欠费户数
         int oweRoomCount = feeStatisticsImpl.getOweRoomCount(queryStatisticsDto);
@@ -113,7 +117,7 @@ public class QueryReportFeeSummaryCmd extends Cmd {
         data.put("preReceivedFee", preReceivedFee);
         data.put("receivedFee", receivedFee);
         data.put("roomCount", roomCount);
-        data.put("freeRoomCount", freeRoomCount);
+        data.put("feeRoomCount", feeRoomCount);
         data.put("oweRoomCount", oweRoomCount);
         data.put("curReceivableFee", curReceivableFee);
 

service-report/src/main/java/com/java110/report/statistics/IFeeStatistics.java

@@ -57,4 +57,11 @@ public interface IFeeStatistics {
     int getOweRoomCount(QueryStatisticsDto queryStatisticsDto);
 
     double getCurReceivableFee(QueryStatisticsDto queryStatisticsDto);
+
+    /**
+     * 查询收费房屋数
+     * @param queryStatisticsDto
+     * @return
+     */
+    long getFeeRoomCount(QueryStatisticsDto queryStatisticsDto);
 }