优化代码

java110

2021-02-25 f1627e52fa6e9fea7b34731beaa55dc0222344da

 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.repair.RepairUserDto;
import com.java110.dto.reportFeeMonthStatistics.ReportFeeMonthStatisticsDto;
import com.java110.po.reportFeeMonthStatistics.ReportFeeMonthStatisticsPo;
import com.java110.report.bmo.reportFeeMonthStatistics.IDeleteReportFeeMonthStatisticsBMO;
@@ -15,8 +16,9 @@
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;

import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Calendar;


@RestController
@RequestMapping(value = "/reportFeeMonthStatistics")
@@ -24,8 +26,10 @@

    @Autowired
    private ISaveReportFeeMonthStatisticsBMO saveReportFeeMonthStatisticsBMOImpl;

    @Autowired
    private IUpdateReportFeeMonthStatisticsBMO updateReportFeeMonthStatisticsBMOImpl;

    @Autowired
    private IDeleteReportFeeMonthStatisticsBMO deleteReportFeeMonthStatisticsBMOImpl;

@@ -137,8 +141,8 @@
        reportFeeMonthStatisticsDto.setUnitNum(unitNum);
        reportFeeMonthStatisticsDto.setRoomId(roomId);
        reportFeeMonthStatisticsDto.setRoomNum(roomNum);
        reportFeeMonthStatisticsDto.setStartTime(StringUtil.isEmpty(startTime) ? null : startTime + "-01");
        reportFeeMonthStatisticsDto.setEndTime(StringUtil.isEmpty(endTime) ? null : endTime + "-01");
        reportFeeMonthStatisticsDto.setStartTime(startTime);
        reportFeeMonthStatisticsDto.setEndTime(endTime);
        return getReportFeeMonthStatisticsBMOImpl.queryReportFeeSummary(reportFeeMonthStatisticsDto);
    }

@@ -172,8 +176,8 @@
        reportFeeMonthStatisticsDto.setUnitNum(unitNum);
        reportFeeMonthStatisticsDto.setRoomId(roomId);
        reportFeeMonthStatisticsDto.setRoomNum(roomNum);
        reportFeeMonthStatisticsDto.setStartTime(StringUtil.isEmpty(startTime) ? null : startTime + "-01");
        reportFeeMonthStatisticsDto.setEndTime(StringUtil.isEmpty(endTime) ? null : endTime + "-01");
        reportFeeMonthStatisticsDto.setStartTime(startTime);
        reportFeeMonthStatisticsDto.setEndTime(endTime);
        return getReportFeeMonthStatisticsBMOImpl.queryReportFloorUnitFeeSummary(reportFeeMonthStatisticsDto);
    }

@@ -193,6 +197,8 @@
                                                    @RequestParam(value = "unitId", required = false) String unitId,
                                                    @RequestParam(value = "roomId", required = false) String roomId,
                                                    @RequestParam(value = "roomNum", required = false) String roomNum,
                                                    @RequestParam(value = "configId", required = false) String configId,
                                                    @RequestParam(value = "feeTypeCd", required = false) String feeTypeCd,
                                                    @RequestParam(value = "startTime", required = false) String startTime,
                                                    @RequestParam(value = "endTime", required = false) String endTime,
                                                    @RequestParam(value = "page") int page,
@@ -207,8 +213,10 @@
        reportFeeMonthStatisticsDto.setUnitNum(unitNum);
        reportFeeMonthStatisticsDto.setRoomId(roomId);
        reportFeeMonthStatisticsDto.setRoomNum(roomNum);
        reportFeeMonthStatisticsDto.setStartTime(StringUtil.isEmpty(startTime) ? null : startTime + "-01");
        reportFeeMonthStatisticsDto.setEndTime(StringUtil.isEmpty(endTime) ? null : endTime + "-01");
        reportFeeMonthStatisticsDto.setConfigId(configId);
        reportFeeMonthStatisticsDto.setFeeTypeCd(feeTypeCd);
        reportFeeMonthStatisticsDto.setStartTime(startTime);
        reportFeeMonthStatisticsDto.setEndTime(endTime);
        return getReportFeeMonthStatisticsBMOImpl.queryFeeBreakdown(reportFeeMonthStatisticsDto);
    }

@@ -230,6 +238,8 @@
                                                 @RequestParam(value = "roomNum", required = false) String roomNum,
                                                 @RequestParam(value = "startTime", required = false) String startTime,
                                                 @RequestParam(value = "endTime", required = false) String endTime,
                                                 @RequestParam(value = "feeName", required = false) String feeName,
                                                 @RequestParam(value = "configId", required = false) String configId,
                                                 @RequestParam(value = "page") int page,
                                                 @RequestParam(value = "row") int row) {
        ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto = new ReportFeeMonthStatisticsDto();
@@ -242,8 +252,10 @@
        reportFeeMonthStatisticsDto.setUnitNum(unitNum);
        reportFeeMonthStatisticsDto.setRoomId(roomId);
        reportFeeMonthStatisticsDto.setRoomNum(roomNum);
        reportFeeMonthStatisticsDto.setStartTime(StringUtil.isEmpty(startTime) ? null : startTime + "-01");
        reportFeeMonthStatisticsDto.setEndTime(StringUtil.isEmpty(endTime) ? null : endTime + "-01");
        reportFeeMonthStatisticsDto.setFeeName(feeName);
        reportFeeMonthStatisticsDto.setConfigId(configId);
        reportFeeMonthStatisticsDto.setStartTime(startTime);
        reportFeeMonthStatisticsDto.setEndTime(endTime);
        return getReportFeeMonthStatisticsBMOImpl.queryFeeDetail(reportFeeMonthStatisticsDto);
    }

@@ -277,9 +289,130 @@
        reportFeeMonthStatisticsDto.setUnitNum(unitNum);
        reportFeeMonthStatisticsDto.setRoomId(roomId);
        reportFeeMonthStatisticsDto.setRoomNum(roomNum);
        reportFeeMonthStatisticsDto.setStartTime(StringUtil.isEmpty(startTime) ? null : startTime + "-01");
        reportFeeMonthStatisticsDto.setEndTime(StringUtil.isEmpty(endTime) ? null : endTime + "-01");
        reportFeeMonthStatisticsDto.setStartTime(startTime);
        reportFeeMonthStatisticsDto.setEndTime(endTime);
        return getReportFeeMonthStatisticsBMOImpl.queryOweFeeDetail(reportFeeMonthStatisticsDto);
    }

    /**
     * 缴费明细表
     *
     * @param communityId 小区ID
     * @return
     * @serviceCode /reportFeeMonthStatistics/queryPayFeeDetail
     * @path /app/reportFeeMonthStatistics/queryPayFeeDetail
     */
    @RequestMapping(value = "/queryPayFeeDetail", method = RequestMethod.GET)
    public ResponseEntity<String> queryPayFeeDetail(@RequestParam(value = "communityId") String communityId,
                                                    @RequestParam(value = "floorId", required = false) String floorId,
                                                    @RequestParam(value = "floorNum", required = false) String floorNum,
                                                    @RequestParam(value = "unitNum", required = false) String unitNum,
                                                    @RequestParam(value = "unitId", required = false) String unitId,
                                                    @RequestParam(value = "roomId", required = false) String roomId,
                                                    @RequestParam(value = "roomNum", required = false) String roomNum,
                                                    @RequestParam(value = "primeRate", required = false) String primeRate,
                                                    @RequestParam(value = "configId", required = false) String configId,
                                                    @RequestParam(value = "startTime", required = false) String startTime,
                                                    @RequestParam(value = "endTime", required = false) String endTime,
                                                    @RequestParam(value = "page") int page,
                                                    @RequestParam(value = "row") int row) {
        ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto = new ReportFeeMonthStatisticsDto();
        reportFeeMonthStatisticsDto.setPage(page);
        reportFeeMonthStatisticsDto.setRow(row);
        reportFeeMonthStatisticsDto.setCommunityId(communityId);
        reportFeeMonthStatisticsDto.setFloorId(floorId);
        reportFeeMonthStatisticsDto.setFloorNum(floorNum);
        reportFeeMonthStatisticsDto.setUnitId(unitId);
        reportFeeMonthStatisticsDto.setUnitNum(unitNum);
        reportFeeMonthStatisticsDto.setRoomId(roomId);
        reportFeeMonthStatisticsDto.setRoomNum(roomNum);
        reportFeeMonthStatisticsDto.setPrimeRate(primeRate);
        reportFeeMonthStatisticsDto.setConfigId(configId);
        reportFeeMonthStatisticsDto.setStartTime(startTime);
        reportFeeMonthStatisticsDto.setEndTime(endTime);
        return getReportFeeMonthStatisticsBMOImpl.queryPayFeeDetail(reportFeeMonthStatisticsDto);
    }

    /**
     * 报修统计表
     *
     * @param communityId 小区id
     * @return
     * @serviceCode /reportFeeMonthStatistics/queryRepair
     * @path /app/reportFeeMonthStatistics/queryRepair
     */
    @RequestMapping(value = "/queryRepair", method = RequestMethod.GET)
    public ResponseEntity<String> queryRepair(@RequestParam(value = "communityId") String communityId,
                                              @RequestParam(value = "repairId", required = false) String repairId,
                                              @RequestParam(value = "state", required = false) String state,
                                              @RequestParam(value = "staffId", required = false) String staffId,
                                              @RequestParam(value = "staffName", required = false) String staffName,
                                              @RequestParam(value = "preStaffId", required = false) String preStaffId,
                                              @RequestParam(value = "preStaffName", required = false) String preStaffName,
                                              @RequestParam(value = "beginStartTime", required = false) String beginStartTime,
                                              @RequestParam(value = "beginEndTime", required = false) String beginEndTime,
                                              @RequestParam(value = "finishStartTime", required = false) String finishStartTime,
                                              @RequestParam(value = "finishEndTime", required = false) String finishEndTime,
                                              @RequestParam(value = "page") int page,
                                              @RequestParam(value = "row") int row) {
        RepairUserDto repairUserDto = new RepairUserDto();
        repairUserDto.setCommunityId(communityId);
        repairUserDto.setRepairId(repairId);
        repairUserDto.setState(state);
        repairUserDto.setStaffId(staffId);
        repairUserDto.setStaffName(staffName);
        repairUserDto.setPreStaffId(preStaffId);
        repairUserDto.setPreStaffName(preStaffName);
        if (!StringUtil.isEmpty(beginStartTime)) {
            repairUserDto.setBeginStartTime(beginStartTime + " 00:00:00");
        }
        if (!StringUtil.isEmpty(beginEndTime)) {
            repairUserDto.setBeginEndTime(beginEndTime + " 23:59:59");
        }
        if (!StringUtil.isEmpty(finishStartTime)) {
            repairUserDto.setFinishStartTime(finishStartTime + " 00:00:00");
        }
        if (!StringUtil.isEmpty(finishEndTime)) {
            repairUserDto.setFinishEndTime(finishEndTime + " 23:59:59");
        }
        repairUserDto.setPage(page);
        repairUserDto.setRow(row);
        return getReportFeeMonthStatisticsBMOImpl.queryRepair(repairUserDto);
    }

    /**
     * 查询费用分项表
     *
     * @param communityId 小区ID
     * @return
     * @serviceCode /reportFeeMonthStatistics/queryDeadlineFee
     * @path /app/reportFeeMonthStatistics/queryDeadlineFee
     */
    @RequestMapping(value = "/queryDeadlineFee", method = RequestMethod.GET)
    public ResponseEntity<String> queryDeadlineFee(@RequestParam(value = "communityId") String communityId,
                                                   @RequestParam(value = "floorId", required = false) String floorId,
                                                   @RequestParam(value = "floorNum", required = false) String floorNum,
                                                   @RequestParam(value = "unitNum", required = false) String unitNum,
                                                   @RequestParam(value = "unitId", required = false) String unitId,
                                                   @RequestParam(value = "roomId", required = false) String roomId,
                                                   @RequestParam(value = "roomNum", required = false) String roomNum,
                                                   @RequestParam(value = "page") int page,
                                                   @RequestParam(value = "row") int row) {
        ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto = new ReportFeeMonthStatisticsDto();
        reportFeeMonthStatisticsDto.setPage(page);
        reportFeeMonthStatisticsDto.setRow(row);
        reportFeeMonthStatisticsDto.setCommunityId(communityId);
        reportFeeMonthStatisticsDto.setFloorId(floorId);
        reportFeeMonthStatisticsDto.setFloorNum(floorNum);
        reportFeeMonthStatisticsDto.setUnitId(unitId);
        reportFeeMonthStatisticsDto.setUnitNum(unitNum);
        reportFeeMonthStatisticsDto.setRoomId(roomId);
        reportFeeMonthStatisticsDto.setRoomNum(roomNum);
        reportFeeMonthStatisticsDto.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
        Calendar calendar = Calendar.getInstance();
        calendar.add(Calendar.DAY_OF_MONTH, 7);
        reportFeeMonthStatisticsDto.setEndTime(DateUtil.getFormatTimeString(calendar.getTime(), DateUtil.DATE_FORMATE_STRING_A));
        return getReportFeeMonthStatisticsBMOImpl.queryDeadlineFee(reportFeeMonthStatisticsDto);
    }


@@ -303,6 +436,25 @@
    }

    /**
     * 查询到期提醒
     *
     * @param communityId 小区ID
     * @return
     * @serviceCode /reportFeeMonthStatistics/queryDeadlineCount
     * @path /app/reportFeeMonthStatistics/queryDeadlineCount
     */
    @RequestMapping(value = "/queryDeadlineCount", method = RequestMethod.GET)
    public ResponseEntity<String> queryDeadlineCount(@RequestParam(value = "communityId") String communityId) {
        ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto = new ReportFeeMonthStatisticsDto();
        reportFeeMonthStatisticsDto.setCommunityId(communityId);
        reportFeeMonthStatisticsDto.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
        Calendar calendar = Calendar.getInstance();
        calendar.add(Calendar.DAY_OF_MONTH, 7);
        reportFeeMonthStatisticsDto.setEndTime(DateUtil.getFormatTimeString(calendar.getTime(), DateUtil.DATE_FORMATE_STRING_A));
        return getReportFeeMonthStatisticsBMOImpl.queryDeadlinePaymentCount(reportFeeMonthStatisticsDto);
    }

    /**
     * 查询费用分项表
     *
     * @param communityId 小区ID
@@ -325,4 +477,35 @@
        return getReportFeeMonthStatisticsBMOImpl.queryPrePayment(reportFeeMonthStatisticsDto);
    }

    /**
     * 查询费用分项表
     *
     * @param communityId 小区ID
     * @return
     * @serviceCode /reportFeeMonthStatistics/queryOwePaymentCount
     * @path /app/reportFeeMonthStatistics/queryOwePaymentCount
     */
    @RequestMapping(value = "/queryOwePaymentCount", method = RequestMethod.GET)
    public ResponseEntity<String> queryOwePaymentCount(@RequestParam(value = "communityId") String communityId) {
        ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto = new ReportFeeMonthStatisticsDto();
        reportFeeMonthStatisticsDto.setCommunityId(communityId);
        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);
    }

}