联讯物业系统后台
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
xiaogang
2022-08-04 6bf8b48e9d689ab90864bc2ee0e6ebeae3a4c1fa 
 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.FloorDto;


import com.java110.dto.RoomDto;


import com.java110.dto.repair.RepairUserDto;


import com.java110.dto.report.ReportDeposit;


@@ -20,6 +21,7 @@




import java.util.Calendar;


import java.util.HashMap;


import java.util.List;


import java.util.Map;




@RestController


@@ -211,6 +213,7 @@


                                                    @RequestParam(value = "feeTypeCd", required = false) String feeTypeCd,


                                                    @RequestParam(value = "startTime", required = false) String startTime,


                                                    @RequestParam(value = "endTime", required = false) String endTime,


                                                    @RequestParam(value = "yearMonth", required = false) String yearMonth,


                                                    @RequestParam(value = "page") int page,


                                                    @RequestParam(value = "row") int row) {


        ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto = new ReportFeeMonthStatisticsDto();


@@ -225,6 +228,7 @@


        reportFeeMonthStatisticsDto.setRoomNum(roomNum);


        reportFeeMonthStatisticsDto.setConfigId(configId);


        reportFeeMonthStatisticsDto.setFeeTypeCd(feeTypeCd);


        reportFeeMonthStatisticsDto.setYearMonth(yearMonth);


        if (!StringUtil.isEmpty(startTime)) {


            reportFeeMonthStatisticsDto.setStartTime(startTime + " 00:00:00");


        }


@@ -250,6 +254,7 @@


                                                 @RequestParam(value = "unitId", required = false) String unitId,


                                                 @RequestParam(value = "roomId", required = false) String roomId,


                                                 @RequestParam(value = "roomNum", required = false) String roomNum,


                                                 @RequestParam(value = "feeTypeCd", required = false) String feeTypeCd,


                                                 @RequestParam(value = "startTime", required = false) String startTime,


                                                 @RequestParam(value = "endTime", required = false) String endTime,


                                                 @RequestParam(value = "feeName", required = false) String feeName,


@@ -268,6 +273,7 @@


        reportFeeMonthStatisticsDto.setRoomNum(roomNum);


        reportFeeMonthStatisticsDto.setFeeName(feeName);


        reportFeeMonthStatisticsDto.setConfigId(configId);


        reportFeeMonthStatisticsDto.setFeeTypeCd(feeTypeCd);


        reportFeeMonthStatisticsDto.setStartTime(startTime);


        reportFeeMonthStatisticsDto.setEndTime(endTime);


        return getReportFeeMonthStatisticsBMOImpl.queryFeeDetail(reportFeeMonthStatisticsDto);


@@ -291,6 +297,7 @@


                                                    @RequestParam(value = "roomNum", required = false) String roomNum,


                                                    @RequestParam(value = "startTime", required = false) String startTime,


                                                    @RequestParam(value = "endTime", required = false) String endTime,


                                                    @RequestParam(value = "objName", required = false) String objName,


                                                    @RequestParam(value = "page") int page,


                                                    @RequestParam(value = "row") int row) {


        ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto = new ReportFeeMonthStatisticsDto();


@@ -305,6 +312,7 @@


        reportFeeMonthStatisticsDto.setRoomNum(roomNum);


        reportFeeMonthStatisticsDto.setStartTime(startTime);


        reportFeeMonthStatisticsDto.setEndTime(endTime);


        reportFeeMonthStatisticsDto.setObjName(objName);


        return getReportFeeMonthStatisticsBMOImpl.queryOweFeeDetail(reportFeeMonthStatisticsDto);


    }




@@ -331,6 +339,7 @@


                                                    @RequestParam(value = "startTime", required = false) String startTime,


                                                    @RequestParam(value = "endTime", required = false) String endTime,


                                                    @RequestParam(value = "objId", required = false) String objId,


                                                    @RequestParam(value = "roomName", required = false) String roomName,


                                                    @RequestParam(value = "page") int page,


                                                    @RequestParam(value = "row") int row) {


        ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto = new ReportFeeMonthStatisticsDto();


@@ -350,6 +359,12 @@


        reportFeeMonthStatisticsDto.setStartTime(startTime);


        reportFeeMonthStatisticsDto.setEndTime(endTime);


        reportFeeMonthStatisticsDto.setObjId(objId);


        if(!StringUtil.isEmpty(roomName)){


            String[] roomNameArray = roomName.split("-");


            reportFeeMonthStatisticsDto.setFloorNum(roomNameArray[0]);


            reportFeeMonthStatisticsDto.setUnitNum(roomNameArray[1]);


            reportFeeMonthStatisticsDto.setRoomNum(roomNameArray[2]);


        }


        return getReportFeeMonthStatisticsBMOImpl.queryPayFeeDetail(reportFeeMonthStatisticsDto);


    }




@@ -551,22 +566,6 @@


        return getReportFeeMonthStatisticsBMOImpl.queryOwePaymentCount(reportFeeMonthStatisticsDto);


    }






    /**


     * 查询费用分项表


     *


     * @param communityId 小区ID


     * @return


     * @serviceCode /reportFeeMonthStatistics/queryReportProficient


     * @path /app/reportFeeMonthStatistics/queryReportProficient


     */


    @RequestMapping(value = "/queryReportProficient", method = RequestMethod.GET)


    public ResponseEntity<String> queryReportProficient(@RequestParam(value = "communityId") String communityId) {


        ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto = new ReportFeeMonthStatisticsDto();


        reportFeeMonthStatisticsDto.setCommunityId(communityId);


        return getReportFeeMonthStatisticsBMOImpl.queryReportProficientCount(reportFeeMonthStatisticsDto);


    }




    /**


     * 查询未收费房屋


     * select t.* from building_room t


@@ -589,11 +588,9 @@


     * @path /app/reportFeeMonthStatistics/queryNoFeeRooms


     */


    @RequestMapping(value = "/queryNoFeeRooms", method = RequestMethod.GET)


    public ResponseEntity<String> queryNoFeeRooms(


            @RequestParam(value = "communityId") String communityId,


            @RequestParam(value = "page") int page,


            @RequestParam(value = "row") int row


    ) {


    public ResponseEntity<String> queryNoFeeRooms(@RequestParam(value = "communityId") String communityId,


                                                  @RequestParam(value = "page") int page,


                                                  @RequestParam(value = "row") int row) {


        RoomDto roomDto = new RoomDto();


        roomDto.setCommunityId(communityId);


        roomDto.setPage(page);


@@ -613,13 +610,17 @@


     * @path /app/reportFeeMonthStatistics/queryHuaningOweFee


     */


    @RequestMapping(value = "/queryHuaningOweFee", method = RequestMethod.GET)


    public ResponseEntity<String> queryHuaningOweFee(


            @RequestParam(value = "communityId") String communityId,


            @RequestParam(value = "page") int page,


            @RequestParam(value = "row") int row


    ) {


    public ResponseEntity<String> queryHuaningOweFee(@RequestParam(value = "communityId") String communityId,


                                                     @RequestParam(value = "configId", required = false) String configId,


                                                     @RequestParam(value = "feeTypeCd", required = false) String feeTypeCd,


                                                     @RequestParam(value = "floorNum", required = false) String floorNum,


                                                     @RequestParam(value = "page") int page,


                                                     @RequestParam(value = "row") int row) {


        ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto = new ReportFeeMonthStatisticsDto();


        reportFeeMonthStatisticsDto.setCommunityId(communityId);


        reportFeeMonthStatisticsDto.setConfigId(configId);


        reportFeeMonthStatisticsDto.setFeeTypeCd(feeTypeCd);


        reportFeeMonthStatisticsDto.setFloorNum(floorNum);


        reportFeeMonthStatisticsDto.setPage(page);


        reportFeeMonthStatisticsDto.setRow(row);


        reportFeeMonthStatisticsDto.setFeeYear(DateUtil.getYear() + "");


@@ -637,15 +638,19 @@


     * @path /app/reportFeeMonthStatistics/queryHuaningPayFee


     */


    @RequestMapping(value = "/queryHuaningPayFee", method = RequestMethod.GET)


    public ResponseEntity<String> queryHuaningPayFee(


            @RequestParam(value = "communityId") String communityId,


            @RequestParam(value = "year") int year,


            @RequestParam(value = "month") int month,


            @RequestParam(value = "page") int page,


            @RequestParam(value = "row") int row


    ) {


    public ResponseEntity<String> queryHuaningPayFee(@RequestParam(value = "communityId") String communityId,


                                                     @RequestParam(value = "configId", required = false) String configId,


                                                     @RequestParam(value = "feeTypeCd", required = false) String feeTypeCd,


                                                     @RequestParam(value = "floorNum", required = false) String floorNum,


                                                     @RequestParam(value = "year", required = false) int year,


                                                     @RequestParam(value = "month", required = false) int month,


                                                     @RequestParam(value = "page") int page,


                                                     @RequestParam(value = "row") int row) {


        Map paramInfo = new HashMap();


        paramInfo.put("communityId", communityId);


        paramInfo.put("configId", configId);


        paramInfo.put("feeTypeCd", feeTypeCd);


        paramInfo.put("floorNum", floorNum);


        paramInfo.put("year", year);


        paramInfo.put("month", month);


        paramInfo.put("page", page);


@@ -664,13 +669,11 @@


     * @path /app/reportFeeMonthStatistics/queryHuaningPayFeeTwo


     */


    @RequestMapping(value = "/queryHuaningPayFeeTwo", method = RequestMethod.GET)


    public ResponseEntity<String> queryHuaningPayFeeTwo(


            @RequestParam(value = "communityId") String communityId,


            @RequestParam(value = "year") int year,


            @RequestParam(value = "month") int month,


            @RequestParam(value = "page") int page,


            @RequestParam(value = "row") int row


    ) {


    public ResponseEntity<String> queryHuaningPayFeeTwo(@RequestParam(value = "communityId") String communityId,


                                                        @RequestParam(value = "year") int year,


                                                        @RequestParam(value = "month") int month,


                                                        @RequestParam(value = "page") int page,


                                                        @RequestParam(value = "row") int row) {


        Map paramInfo = new HashMap();


        paramInfo.put("communityId", communityId);


        paramInfo.put("year", year);


@@ -691,13 +694,11 @@


     * @path /app/reportFeeMonthStatistics/queryHuaningOweFeeDetail


     */


    @RequestMapping(value = "/queryHuaningOweFeeDetail", method = RequestMethod.GET)


    public ResponseEntity<String> queryHuaningOweFeeDetail(


            @RequestParam(value = "communityId") String communityId,


            @RequestParam(value = "year") int year,


            @RequestParam(value = "month") int month,


            @RequestParam(value = "page") int page,


            @RequestParam(value = "row") int row


    ) {


    public ResponseEntity<String> queryHuaningOweFeeDetail(@RequestParam(value = "communityId") String communityId,


                                                           @RequestParam(value = "year") int year,


                                                           @RequestParam(value = "month") int month,


                                                           @RequestParam(value = "page") int page,


                                                           @RequestParam(value = "row") int row) {


        Map paramInfo = new HashMap();


        paramInfo.put("communityId", communityId);


        paramInfo.put("year", year);