优化1.5报表相关bug

Your Name

2023-07-04 d3e23e26fcfc17e770fca7c29b290ef5082e5734

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

@@ -1,8 +1,8 @@
package com.java110.report.api;

import com.alibaba.fastjson.JSONObject;
import com.java110.dto.reportOweFee.ReportOweFeeDto;
import com.java110.po.reportOweFee.ReportOweFeePo;
import com.java110.dto.reportFee.ReportOweFeeDto;
import com.java110.po.reportFee.ReportOweFeePo;
import com.java110.report.bmo.reportOweFee.IDeleteReportOweFeeBMO;
import com.java110.report.bmo.reportOweFee.IGetReportOweFeeBMO;
import com.java110.report.bmo.reportOweFee.ISaveReportOweFeeBMO;
@@ -102,6 +102,8 @@
                                                    @RequestParam(value = "unitId", required = false) String unitId,
                                                    @RequestParam(value = "roomSubType", required = false) String roomSubType,
                                                    @RequestParam(value = "roomNum", required = false) String roomNum,
                                                    @RequestParam(value = "ownerId", required = false) String ownerId,
                                                    @RequestParam(value = "payerObjId", required = false) String payerObjId,
                                                    @RequestParam(value = "page") int page,
                                                    @RequestParam(value = "row") int row) {
        ReportOweFeeDto reportOweFeeDto = new ReportOweFeeDto();
@@ -115,6 +117,8 @@
        reportOweFeeDto.setUnitId(unitId);
        reportOweFeeDto.setRoomSubType(roomSubType);
        reportOweFeeDto.setRoomNum(roomNum);
        reportOweFeeDto.setOwnerId(ownerId);
        reportOweFeeDto.setPayerObjId(payerObjId);
        if (!StringUtil.isEmpty(configIds)) {
            String[] tmpConfigIds = configIds.split(",");
            reportOweFeeDto.setConfigIds(tmpConfigIds);
@@ -135,12 +139,22 @@
                                                       @RequestParam(value = "configIds", required = false) String configIds,
                                                       @RequestParam(value = "payObjType", required = false) String payObjType,
                                                       @RequestParam(value = "hasOweFee", required = false) String hasOweFee,
                                                       @RequestParam(value = "ownerName", required = false) String ownerName,
                                                       @RequestParam(value = "floorId", required = false) String floorId,
                                                       @RequestParam(value = "unitId", required = false) String unitId,
                                                       @RequestParam(value = "roomSubType", required = false) String roomSubType,
                                                       @RequestParam(value = "roomNum", required = false) String roomNum,
                                                       @RequestParam(value = "num", required = false) String num) {
        ReportOweFeeDto reportOweFeeDto = new ReportOweFeeDto();
        reportOweFeeDto.setPayerObjType(payObjType);
        reportOweFeeDto.setPayerObjName(num);
        reportOweFeeDto.setCommunityId(communityId);
        reportOweFeeDto.setHasOweFee(hasOweFee);
        reportOweFeeDto.setOwnerName(ownerName);
        reportOweFeeDto.setFloorId(floorId);
        reportOweFeeDto.setUnitId(unitId);
        reportOweFeeDto.setRoomSubType(roomSubType);
        reportOweFeeDto.setRoomNum(roomNum);
        if (!StringUtil.isEmpty(configIds)) {
            String[] tmpConfigIds = configIds.split(",");
            reportOweFeeDto.setConfigIds(tmpConfigIds);