我菩提免责 reompte

service-report/src/main/java/com/java110/report/cmd/dataReport/QueryDataReportFeeStatisticsCmd.java

@@ -6,7 +6,9 @@ import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.FloorDto;
 import com.java110.dto.report.QueryStatisticsDto;
+import com.java110.intf.community.IFloorV1InnerServiceSMO;
 import com.java110.report.statistics.IBaseDataStatistics;
 import com.java110.report.statistics.IFeeStatistics;
 import com.java110.utils.exception.CmdException;
@@ -33,6 +35,9 @@ public class QueryDataReportFeeStatisticsCmd extends Cmd {
     @Autowired
     private IFeeStatistics feeStatisticsImpl;
 
+    @Autowired
+    private IFloorV1InnerServiceSMO floorV1InnerServiceSMOImpl;
+
     @Autowired
     private IBaseDataStatistics baseDataStatisticsImpl;
 
@@ -65,17 +70,18 @@ public class QueryDataReportFeeStatisticsCmd extends Cmd {
         //todo 根据楼栋ID循环查询
         for (String floorId : floorIds) {
             //todo 获取到数据
-            doGetData(floorId, data,reqJson);
+            doGetData(floorId, data, reqJson);
         }
         context.setResponseEntity(ResultVo.createResponseEntity(data));
     }
 
     /**
      * 查询数据
+     *
      * @param floorId
      * @param datas
      */
-    private void doGetData(String floorId, JSONArray datas,JSONObject reqJson) {
+    private void doGetData(String floorId, JSONArray datas, JSONObject reqJson) {
         JSONObject data = new JSONObject();
         QueryStatisticsDto queryStatisticsDto = new QueryStatisticsDto();
         queryStatisticsDto.setCommunityId(reqJson.getString("communityId"));
@@ -83,53 +89,61 @@ public class QueryDataReportFeeStatisticsCmd extends Cmd {
         queryStatisticsDto.setStartDate(reqJson.getString("startDate"));
         queryStatisticsDto.setEndDate(reqJson.getString("endDate"));
 
+        // todo 查询楼栋
+        FloorDto floorDto = new FloorDto();
+        floorDto.setFloorId(floorId);
+        floorDto.setCommunityId(reqJson.getString("communityId"));
+        List<FloorDto> floorDtos = floorV1InnerServiceSMOImpl.queryFloors(floorDto);
+        Assert.listOnlyOne(floorDtos, "楼栋不存在");
+        data.put("floorNum", floorDtos.get(0).getFloorNum());
+
         // todo 查询户数
         long roomCount = baseDataStatisticsImpl.getRoomCount(queryStatisticsDto);
-        data.put("roomCount",roomCount);
+        data.put("roomCount", roomCount);
 
         // todo 查询空置户数
         long freeCount = baseDataStatisticsImpl.getFreeRoomCount(queryStatisticsDto);
-        data.put("freeCount",freeCount);
+        data.put("freeCount", freeCount);
 
         // todo 查询 历史欠费
         double hisMonthOweFee = feeStatisticsImpl.getHisMonthOweFee(queryStatisticsDto);
-        data.put("hisMonthOweFee",hisMonthOweFee);
+        data.put("hisMonthOweFee", hisMonthOweFee);
 
         // todo 查询总欠费
         double oweFee = feeStatisticsImpl.getOweFee(queryStatisticsDto);
-        data.put("oweFee",oweFee);
+        data.put("oweFee", oweFee);
 
         // todo 本日已交户数
-        queryStatisticsDto.setStartDate(DateUtil.getFormatTimeStringB(DateUtil.getCurrentDate())+" 00:00:00");
-        queryStatisticsDto.setEndDate(DateUtil.getFormatTimeStringB(DateUtil.getCurrentDate())+" 23:59:59");
+        queryStatisticsDto.setStartDate(DateUtil.getFormatTimeStringB(DateUtil.getCurrentDate()) + " 00:00:00");
+        queryStatisticsDto.setEndDate(DateUtil.getFormatTimeStringB(DateUtil.getCurrentDate()) + " 23:59:59");
         queryStatisticsDto.setHisDate(DateUtil.getFormatTimeStringB(DateUtil.getFirstDate()));
         double todayReceivedRoomCount = feeStatisticsImpl.getReceivedRoomCount(queryStatisticsDto);
-        data.put("todayReceivedRoomCount",todayReceivedRoomCount);
+        data.put("todayReceivedRoomCount", todayReceivedRoomCount);
 
         // todo 本日已交金额
         double todayReceivedRoomAmount = feeStatisticsImpl.getReceivedRoomAmount(queryStatisticsDto);
-        data.put("todayReceivedRoomAmount",todayReceivedRoomAmount);
+        data.put("todayReceivedRoomAmount", todayReceivedRoomAmount);
 
         // todo 历史欠费清缴户
         double hisOweReceivedRoomCount = feeStatisticsImpl.getHisOweReceivedRoomCount(queryStatisticsDto);
-        data.put("hisOweReceivedRoomCount",hisOweReceivedRoomCount);
+        data.put("hisOweReceivedRoomCount", hisOweReceivedRoomCount);
         // todo 历史欠费清缴金额
         double hisOweReceivedRoomAmount = feeStatisticsImpl.getHisOweReceivedRoomAmount(queryStatisticsDto);
-        data.put("hisOweReceivedRoomAmount",hisOweReceivedRoomAmount);
+        data.put("hisOweReceivedRoomAmount", hisOweReceivedRoomAmount);
 
         // todo 这里时间又改回来
         queryStatisticsDto.setStartDate(reqJson.getString("startDate"));
         queryStatisticsDto.setEndDate(reqJson.getString("endDate"));
         // todo 本月已收户
         double monthReceivedRoomCount = feeStatisticsImpl.getReceivedRoomCount(queryStatisticsDto);
-        data.put("monthReceivedRoomCount",monthReceivedRoomCount);
+        data.put("monthReceivedRoomCount", monthReceivedRoomCount);
 
         // todo 已收金额
         double monthReceivedRoomAmount = feeStatisticsImpl.getReceivedRoomAmount(queryStatisticsDto);
-        data.put("monthReceivedRoomAmount",monthReceivedRoomAmount);
+        data.put("monthReceivedRoomAmount", monthReceivedRoomAmount);
         // todo 剩余未收
         double curMonthOweFee = feeStatisticsImpl.getCurMonthOweFee(queryStatisticsDto);
-        data.put("curMonthOweFee",curMonthOweFee);
+        data.put("curMonthOweFee", curMonthOweFee);
 
         datas.add(data);