暂存代码

java110-interface/src/main/java/com/java110/intf/report/IReportFeeMonthStatisticsInnerServiceSMO.java

@@ -2,6 +2,7 @@ package com.java110.intf.report;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.config.feign.FeignConfiguration;
+import com.java110.dto.RoomDto;
 import com.java110.dto.fee.FeeConfigDto;
 import com.java110.dto.repair.RepairUserDto;
 import com.java110.dto.reportFeeMonthStatistics.ReportFeeMonthStatisticsDto;
@@ -263,6 +264,7 @@ public interface IReportFeeMonthStatisticsInnerServiceSMO {
 
     @RequestMapping(value = "/queryReportProficientCount", method = RequestMethod.POST)
     JSONObject queryReportProficientCount(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto);
+
     /**
      * <p>查询小区楼信息</p>
      *
@@ -299,4 +301,21 @@ public interface IReportFeeMonthStatisticsInnerServiceSMO {
     @RequestMapping(value = "/queryRepairForStaff", method = RequestMethod.POST)
     List<RepairUserDto> queryRepairForStaff(@RequestBody RepairUserDto repairUserDto);
 
+    /**
+     * 查询未收费房屋
+     *
+     * @param roomDto
+     * @return
+     */
+    @RequestMapping(value = "/queryNoFeeRoomsCount", method = RequestMethod.POST)
+    int queryNoFeeRoomsCount(@RequestBody RoomDto roomDto);
+
+    /**
+     * 查询未收费房屋
+     *
+     * @param roomDto 房屋
+     * @return
+     */
+    @RequestMapping(value = "/queryNoFeeRooms", method = RequestMethod.POST)
+    List<RoomDto> queryNoFeeRooms(@RequestBody RoomDto roomDto);
 }

service-report/src/main/java/com/java110/report/api/ReportFeeMonthStatisticsApi.java

@@ -1,6 +1,7 @@
 package com.java110.report.api;
 
 import com.alibaba.fastjson.JSONObject;
+import com.java110.dto.RoomDto;
 import com.java110.dto.repair.RepairUserDto;
 import com.java110.dto.reportFeeMonthStatistics.ReportFeeMonthStatisticsDto;
 import com.java110.po.reportFeeMonthStatistics.ReportFeeMonthStatisticsPo;
@@ -521,4 +522,19 @@ public class ReportFeeMonthStatisticsApi {
      * limit 10
      */
 
+    /**
+     * 查询费用分项表
+     *
+     * @param communityId 小区ID
+     * @return
+     * @serviceCode /reportFeeMonthStatistics/queryNoFeeRooms
+     * @path /app/reportFeeMonthStatistics/queryNoFeeRooms
+     */
+    @RequestMapping(value = "/queryNoFeeRooms", method = RequestMethod.GET)
+    public ResponseEntity<String> queryNoFeeRooms(@RequestParam(value = "communityId") String communityId) {
+        RoomDto roomDto = new RoomDto();
+        roomDto.setCommunityId(communityId);
+        return getReportFeeMonthStatisticsBMOImpl.queryNoFeeRooms(roomDto);
+    }
+
 }

service-report/src/main/java/com/java110/report/bmo/reportFeeMonthStatistics/IGetReportFeeMonthStatisticsBMO.java

@@ -1,5 +1,6 @@
 package com.java110.report.bmo.reportFeeMonthStatistics;
 
+import com.java110.dto.RoomDto;
 import com.java110.dto.repair.RepairUserDto;
 import com.java110.dto.reportFeeMonthStatistics.ReportFeeMonthStatisticsDto;
 import org.springframework.http.ResponseEntity;
@@ -61,4 +62,10 @@ public interface IGetReportFeeMonthStatisticsBMO {
      */
     ResponseEntity<String> queryRepair(RepairUserDto repairUserDto);
 
+    /**
+     * 查询未收费房屋
+     * @param roomDto
+     * @return
+     */
+    ResponseEntity<String> queryNoFeeRooms(RoomDto roomDto);
 }

service-report/src/main/java/com/java110/report/bmo/reportFeeMonthStatistics/impl/GetReportFeeMonthStatisticsBMOImpl.java

@@ -1,6 +1,7 @@
 package com.java110.report.bmo.reportFeeMonthStatistics.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.java110.dto.RoomDto;
 import com.java110.dto.fee.FeeConfigDto;
 import com.java110.dto.fee.FeeDto;
 import com.java110.dto.repair.RepairUserDto;
@@ -604,6 +605,24 @@ public class GetReportFeeMonthStatisticsBMOImpl implements IGetReportFeeMonthSta
         return responseEntity;
     }
 
+    @Override
+    public ResponseEntity<String> queryNoFeeRooms(RoomDto roomDto) {
+        int count = reportFeeMonthStatisticsInnerServiceSMOImpl.queryNoFeeRoomsCount(roomDto);
+
+        List<RoomDto> roomDtos = null;
+        if (count > 0) {
+            roomDtos = reportFeeMonthStatisticsInnerServiceSMOImpl.queryNoFeeRooms(roomDto);
+        } else {
+            roomDtos = new ArrayList<>();
+        }
+
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) roomDto.getRow()), count, roomDtos);
+
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+        return responseEntity;
+    }
+
     @Override
     public ResponseEntity<String> queryPrePayment(ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto) {
 

service-report/src/main/java/com/java110/report/dao/IReportFeeMonthStatisticsServiceDao.java

@@ -294,4 +294,8 @@ public interface IReportFeeMonthStatisticsServiceDao {
      * @return
      */
     List<Map> getFeeConfigReceivableInformation(Map beanCovertMap);
+
+    int queryNoFeeRoomsCount(Map beanCovertMap);
+
+    Object queryNoFeeRooms(Map beanCovertMap);
 }

service-report/src/main/java/com/java110/report/dao/impl/ReportFeeMonthStatisticsServiceDaoImpl.java

@@ -402,5 +402,29 @@ public class ReportFeeMonthStatisticsServiceDaoImpl extends BaseServiceDao imple
         return businessReportFeeMonthStatisticsInfos;
     }
 
+    @Override
+    public int queryNoFeeRoomsCount(Map info) {
+        logger.debug("查询未收费房屋统计数据 入参 info : {}", info);
+
+        List<Map> roomInfos =
+                sqlSessionTemplate.selectList("reportFeeMonthStatisticsServiceDaoImpl.queryNoFeeRoomsCount", info);
+        if (roomInfos.size() < 1) {
+            return 0;
+        }
+
+        return Integer.parseInt(roomInfos.get(0).get("count").toString());
+    }
+
+    @Override
+    public Object queryNoFeeRooms(Map info) {
+        logger.debug("查询未收费房屋统计信息 入参 info : {}", info);
+
+        List<Map> roomInfos =
+                sqlSessionTemplate.selectList("reportFeeMonthStatisticsServiceDaoImpl.queryNoFeeRooms", info);
+
+        return roomInfos;
+    }
+
+
 
 }

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.base.smo.BaseServiceSMO;
 import com.java110.dto.PageDto;
+import com.java110.dto.RoomDto;
 import com.java110.dto.fee.FeeConfigDto;
 import com.java110.dto.repair.RepairUserDto;
 import com.java110.dto.reportFeeMonthStatistics.ReportFeeMonthStatisticsDto;
@@ -318,7 +319,7 @@ public class ReportFeeMonthStatisticsInnerServiceSMOImpl extends BaseServiceSMO
         reportFeeMonthStatisticsDto.setEndTime(DateUtil.getFormatTimeString(calendar.getTime(), DateUtil.DATE_FORMATE_STRING_A));
 
         int deadlineFeeCount = reportFeeMonthStatisticsServiceDaoImpl.queryDeadlineFeeCount(BeanConvertUtil.beanCovertMap(reportFeeMonthStatisticsDto));
-        int  prePaymentCount = reportFeeMonthStatisticsServiceDaoImpl.queryPrePaymentNewCount(BeanConvertUtil.beanCovertMap(reportFeeMonthStatisticsDto));
+        int prePaymentCount = reportFeeMonthStatisticsServiceDaoImpl.queryPrePaymentNewCount(BeanConvertUtil.beanCovertMap(reportFeeMonthStatisticsDto));
 
 
         JSONObject remindInfomation = new JSONObject();
@@ -386,6 +387,28 @@ public class ReportFeeMonthStatisticsInnerServiceSMOImpl extends BaseServiceSMO
         return repairUserDtoList;
     }
 
+    @Override
+    public int queryNoFeeRoomsCount(@RequestBody RoomDto roomDto) {
+        return reportFeeMonthStatisticsServiceDaoImpl.queryNoFeeRoomsCount(BeanConvertUtil.beanCovertMap(roomDto));
+    }
+
+    @Override
+    public List<RoomDto> queryNoFeeRooms(@RequestBody RoomDto roomDto) {
+//校验是否传了 分页信息
+
+        int page = roomDto.getPage();
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            roomDto.setPage((page - 1) * roomDto.getRow());
+        }
+
+        List<RoomDto> rooms =
+                BeanConvertUtil.covertBeanList(reportFeeMonthStatisticsServiceDaoImpl.queryNoFeeRooms(BeanConvertUtil.beanCovertMap(roomDto)),
+                        RoomDto.class);
+
+        return rooms;
+    }
+
 
     public IReportFeeMonthStatisticsServiceDao getReportFeeMonthStatisticsServiceDaoImpl() {
         return reportFeeMonthStatisticsServiceDaoImpl;