1、优化费用向添加bug2、优化缴费显示bug

xiaogang

2022-07-06 ceb59d12ab4e142a66e066e1797ec758bb58bb0b

 service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportReportFeeSMOImpl.java

@@ -6,6 +6,7 @@
import com.java110.api.smo.DefaultAbstractComponentSMO;
import com.java110.api.smo.assetExport.IExportReportFeeSMO;
import com.java110.core.context.IPageData;
import com.java110.core.log.LoggerFactory;
import com.java110.dto.fee.FeeConfigDto;
import com.java110.entity.component.ComponentValidateResult;
import com.java110.utils.cache.MappingCache;
@@ -17,7 +18,6 @@
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
@@ -76,6 +76,7 @@
    public static final String RESOURCE_STORE_USE_RECORD_MANAGE = "resourceStoreUseRecordManage";
    public static final String RESOURCE_STAFF_FEE_MANAGE = "staffFeeManage";
    public static final String REPORT_PAY_FEE_DEPOSIT = "reportPayFeeDeposit";
    public static final String INSPECTION_TASK_DETAILS = "inspectionTaskDetails";

    @Autowired
    private RestTemplate restTemplate;
@@ -168,6 +169,8 @@
            case REPORT_PAY_FEE_DEPOSIT:
                reportPayFeeDeposit(pd, result, workbook);
                break;
            case INSPECTION_TASK_DETAILS:
                inspectionTaskDetails(pd, result, workbook);
        }
        ByteArrayOutputStream os = new ByteArrayOutputStream();
        MultiValueMap headers = new HttpHeaders();
@@ -563,16 +566,17 @@
        row.createCell(4).setCellValue("物品类型");
        row.createCell(5).setCellValue("物品名称");
        row.createCell(6).setCellValue("物品规格");
        row.createCell(7).setCellValue("物品供应商");
        row.createCell(8).setCellValue("物品仓库");
        row.createCell(9).setCellValue("采购/出库方式");
        row.createCell(10).setCellValue("申请数量");
        row.createCell(11).setCellValue("采购/出库数量");
        row.createCell(12).setCellValue("采购价格");
        row.createCell(13).setCellValue("采购总价");
        row.createCell(14).setCellValue("申请备注");
        row.createCell(15).setCellValue("状态");
        row.createCell(16).setCellValue("创建时间");
        row.createCell(7).setCellValue("是否是固定物品");
        row.createCell(8).setCellValue("物品供应商");
        row.createCell(9).setCellValue("物品仓库");
        row.createCell(10).setCellValue("采购/出库方式");
        row.createCell(11).setCellValue("申请数量");
        row.createCell(12).setCellValue("采购/出库数量");
        row.createCell(13).setCellValue("采购价格");
        row.createCell(14).setCellValue("采购总价");
        row.createCell(15).setCellValue("申请备注");
        row.createCell(16).setCellValue("状态");
        row.createCell(17).setCellValue("创建时间");

        JSONArray purchaseApplyDetails = this.getPurchaseApplyDetail(pd, result);
        if (purchaseApplyDetails == null || purchaseApplyDetails.size() == 0) {
@@ -589,12 +593,13 @@
            row.createCell(4).setCellValue(dataObj.getString("parentRstName") + ">" + dataObj.getString("rstName"));
            row.createCell(5).setCellValue(dataObj.getString("resName"));
            row.createCell(6).setCellValue(dataObj.getString("specName"));
            row.createCell(7).setCellValue(dataObj.getString("supplierName"));
            row.createCell(8).setCellValue(dataObj.getString("shName"));
            row.createCell(9).setCellValue(dataObj.getString("warehousingWayName") + dataObj.getString("resOrderTypeName"));
            row.createCell(10).setCellValue(dataObj.getString("quantity") + dataObj.getString("unitCodeName"));
            row.createCell(11).setCellValue(dataObj.getString("purchaseQuantity") + dataObj.getString("unitCodeName"));
            row.createCell(12).setCellValue(dataObj.getString("price"));
            row.createCell(7).setCellValue(dataObj.getString("isFixedName"));
            row.createCell(8).setCellValue(dataObj.getString("supplierName"));
            row.createCell(9).setCellValue(dataObj.getString("shName"));
            row.createCell(10).setCellValue(dataObj.getString("warehousingWayName") + dataObj.getString("resOrderTypeName"));
            row.createCell(11).setCellValue(dataObj.getString("quantity") + dataObj.getString("unitCodeName"));
            row.createCell(12).setCellValue(dataObj.getString("purchaseQuantity") + dataObj.getString("unitCodeName"));
            row.createCell(13).setCellValue(dataObj.getString("price"));
            if (!StringUtil.isEmpty(dataObj.getString("resOrderType")) && dataObj.getString("resOrderType").equals("10000") &&
                    !StringUtil.isEmpty(dataObj.getString("purchaseQuantity")) && !StringUtil.isEmpty(dataObj.getString("price"))) { //状态是入库
                //获取采购数量
@@ -603,13 +608,13 @@
                double price = Double.parseDouble(dataObj.getString("price"));
                //获取采购总价
                double totalPrice = purchaseQuantity * price;
                row.createCell(13).setCellValue(String.valueOf(totalPrice));
                row.createCell(14).setCellValue(String.valueOf(totalPrice));
            } else {
                row.createCell(13).setCellValue("--");
                row.createCell(14).setCellValue("--");
            }
            row.createCell(14).setCellValue(dataObj.getString("remark"));
            row.createCell(15).setCellValue(dataObj.getString("stateName"));
            row.createCell(16).setCellValue(dataObj.getString("createTime"));
            row.createCell(15).setCellValue(dataObj.getString("remark"));
            row.createCell(16).setCellValue(dataObj.getString("stateName"));
            row.createCell(17).setCellValue(dataObj.getString("createTime"));
        }
    }

@@ -650,15 +655,16 @@
        row.createCell(2).setCellValue("物品类型");
        row.createCell(3).setCellValue("物品名称");
        row.createCell(4).setCellValue("物品规格");
        row.createCell(5).setCellValue("被调仓库原库存");
        row.createCell(6).setCellValue("调拨数量");
        row.createCell(7).setCellValue("被调仓库");
        row.createCell(8).setCellValue("目标仓库");
        row.createCell(9).setCellValue("申请人ID");
        row.createCell(10).setCellValue("申请人");
        row.createCell(11).setCellValue("调拨说明");
        row.createCell(12).setCellValue("状态");
        row.createCell(13).setCellValue("时间");
        row.createCell(5).setCellValue("是否是固定物品");
        row.createCell(6).setCellValue("被调仓库原库存");
        row.createCell(7).setCellValue("调拨数量");
        row.createCell(8).setCellValue("被调仓库");
        row.createCell(9).setCellValue("目标仓库");
        row.createCell(10).setCellValue("申请人ID");
        row.createCell(11).setCellValue("申请人");
        row.createCell(12).setCellValue("调拨说明");
        row.createCell(13).setCellValue("状态");
        row.createCell(14).setCellValue("时间");

        JSONArray allocationStorehouses = this.getAllocationStorehouseDetail(pd, result);
        if (allocationStorehouses == null || allocationStorehouses.size() == 0) {
@@ -673,19 +679,20 @@
            row.createCell(2).setCellValue(dataObj.getString("parentRstName") + ">" + dataObj.getString("rstName"));
            row.createCell(3).setCellValue(dataObj.getString("resName"));
            row.createCell(4).setCellValue(dataObj.getString("specName"));
            row.createCell(5).setCellValue(dataObj.getString("originalStock") + dataObj.getString("unitCodeName"));
            row.createCell(6).setCellValue(dataObj.getString("stock") + dataObj.getString("unitCodeName"));
            row.createCell(5).setCellValue(dataObj.getString("isFixedName"));
            row.createCell(6).setCellValue(dataObj.getString("originalStock") + dataObj.getString("unitCodeName"));
            row.createCell(7).setCellValue(dataObj.getString("stock") + dataObj.getString("unitCodeName"));
            if (!StringUtil.isEmpty(dataObj.getString("applyType")) && dataObj.getString("applyType").equals("20000")) {  //返还
                row.createCell(7).setCellValue(dataObj.getString("startUserName"));
                row.createCell(8).setCellValue(dataObj.getString("startUserName"));
            } else {
                row.createCell(7).setCellValue(dataObj.getString("shaName"));
                row.createCell(8).setCellValue(dataObj.getString("shaName"));
            }
            row.createCell(8).setCellValue(dataObj.getString("shzName"));
            row.createCell(9).setCellValue(dataObj.getString("startUserId"));
            row.createCell(10).setCellValue(dataObj.getString("startUserName"));
            row.createCell(11).setCellValue(dataObj.getString("remark"));
            row.createCell(12).setCellValue(dataObj.getString("stateName"));
            row.createCell(13).setCellValue(dataObj.getString("createTime"));
            row.createCell(9).setCellValue(dataObj.getString("shzName"));
            row.createCell(10).setCellValue(dataObj.getString("startUserId"));
            row.createCell(11).setCellValue(dataObj.getString("startUserName"));
            row.createCell(12).setCellValue(dataObj.getString("remark"));
            row.createCell(13).setCellValue(dataObj.getString("stateName"));
            row.createCell(14).setCellValue(dataObj.getString("createTime"));
        }
    }

@@ -698,13 +705,14 @@
        row.createCell(3).setCellValue("物品名称");
        row.createCell(4).setCellValue("物品规格");
        row.createCell(5).setCellValue("物品编码");
        row.createCell(6).setCellValue("采购参考价格");
        row.createCell(7).setCellValue("收费标准");
        row.createCell(8).setCellValue("物品库存");
        row.createCell(9).setCellValue("最小计量");
        row.createCell(10).setCellValue("最小计量总数");
        row.createCell(11).setCellValue("物品均价");
        row.createCell(12).setCellValue("物品总价");
        row.createCell(6).setCellValue("是否是固定物品");
        row.createCell(7).setCellValue("采购参考价格");
        row.createCell(8).setCellValue("收费标准");
        row.createCell(9).setCellValue("物品库存");
        row.createCell(10).setCellValue("最小计量");
        row.createCell(11).setCellValue("最小计量总数");
        row.createCell(12).setCellValue("物品均价");
        row.createCell(13).setCellValue("物品总价");
        JSONArray resourceStores = this.getResourceStore(pd, result);
        if (resourceStores == null || resourceStores.size() == 0) {
            return;
@@ -724,22 +732,23 @@
            row.createCell(3).setCellValue(dataObj.getString("resName"));
            row.createCell(4).setCellValue(dataObj.getString("rssName"));
            row.createCell(5).setCellValue(dataObj.getString("resCode"));
            row.createCell(6).setCellValue(dataObj.getString("price"));
            row.createCell(6).setCellValue(dataObj.getString("isFixedName"));
            row.createCell(7).setCellValue(dataObj.getString("price"));
            //获取最低价
            String outLowPrice = dataObj.getString("outLowPrice");
            //获取最高价
            String outHighPrice = dataObj.getString("outHighPrice");
            if (!StringUtil.isEmpty(outLowPrice) && !StringUtil.isEmpty(outHighPrice) && outLowPrice.equals(outHighPrice)) {
                row.createCell(7).setCellValue(outLowPrice);
                row.createCell(8).setCellValue(outLowPrice);
            } else if (!StringUtil.isEmpty(outLowPrice) && !StringUtil.isEmpty(outHighPrice) && !outLowPrice.equals(outHighPrice)) {
                row.createCell(7).setCellValue(dataObj.getString("outLowPrice") + "-" + dataObj.getString("outHighPrice"));
                row.createCell(8).setCellValue(dataObj.getString("outLowPrice") + "-" + dataObj.getString("outHighPrice"));
            } else {
                row.createCell(7).setCellValue("--");
                row.createCell(8).setCellValue("--");
            }
            row.createCell(8).setCellValue(dataObj.getString("stock") + dataObj.getString("unitCodeName"));
            row.createCell(9).setCellValue("1" + dataObj.getString("unitCodeName") + "=" + dataObj.getString("miniUnitStock") + dataObj.getString("miniUnitCodeName"));
            row.createCell(10).setCellValue(dataObj.getString("miniStock") + dataObj.getString("miniUnitCodeName"));
            row.createCell(11).setCellValue(dataObj.getString("averagePrice"));
            row.createCell(9).setCellValue(dataObj.getString("stock") + dataObj.getString("unitCodeName"));
            row.createCell(10).setCellValue("1" + dataObj.getString("unitCodeName") + "=" + dataObj.getString("miniUnitStock") + dataObj.getString("miniUnitCodeName"));
            row.createCell(11).setCellValue(dataObj.getString("miniStock") + dataObj.getString("miniUnitCodeName"));
            row.createCell(12).setCellValue(dataObj.getString("averagePrice"));
            if (!StringUtil.isEmpty(dataObj.getString("stock")) && !StringUtil.isEmpty(dataObj.getString("averagePrice"))) {
                //获取物品库存数量
                double stock = Double.parseDouble(dataObj.getString("stock"));
@@ -750,9 +759,9 @@
                //计算物品总价
                BigDecimal price = x1.multiply(y1);
                double totalPrice = price.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
                row.createCell(12).setCellValue(String.valueOf(totalPrice));
                row.createCell(13).setCellValue(String.valueOf(totalPrice));
            } else {
                row.createCell(12).setCellValue("0.0");
                row.createCell(13).setCellValue("0.0");
            }
        }
    }
@@ -765,9 +774,10 @@
        row.createCell(2).setCellValue("使用人");
        row.createCell(3).setCellValue("操作人");
        row.createCell(4).setCellValue("物品");
        row.createCell(5).setCellValue("申请时间");
        row.createCell(6).setCellValue("采购方式");
        row.createCell(7).setCellValue("审批状态");
        row.createCell(5).setCellValue("是否是固定物品");
        row.createCell(6).setCellValue("申请时间");
        row.createCell(7).setCellValue("采购方式");
        row.createCell(8).setCellValue("审批状态");
        JSONArray purchaseApplys = this.getPurchaseApply(pd, result);
        if (purchaseApplys == null || purchaseApplys.size() == 0) {
            return;
@@ -781,15 +791,16 @@
            row.createCell(2).setCellValue(dataObj.getString("endUserName"));
            row.createCell(3).setCellValue(dataObj.getString("createUserName"));
            row.createCell(4).setCellValue(dataObj.getString("resourceNames"));
            row.createCell(5).setCellValue(dataObj.getString("createTime"));
            row.createCell(5).setCellValue(dataObj.getString("isFixedName"));
            row.createCell(6).setCellValue(dataObj.getString("createTime"));
            //获取入库方式
            String warehousingWay = dataObj.getString("warehousingWay");
            if (!StringUtil.isEmpty(warehousingWay) && warehousingWay.equals("10000")) {
                row.createCell(6).setCellValue("直接入库");
                row.createCell(7).setCellValue("直接入库");
            } else {
                row.createCell(6).setCellValue("采购申请入库");
                row.createCell(7).setCellValue("采购申请入库");
            }
            row.createCell(7).setCellValue(dataObj.getString("stateName"));
            row.createCell(8).setCellValue(dataObj.getString("stateName"));
        }
    }

@@ -798,11 +809,12 @@
        Row row = sheet.createRow(0);
        row.createCell(0).setCellValue("单号");
        row.createCell(1).setCellValue("物品");
        row.createCell(2).setCellValue("申请人");
        row.createCell(3).setCellValue("操作人");
        row.createCell(4).setCellValue("申请时间");
        row.createCell(5).setCellValue("状态");
        row.createCell(6).setCellValue("领用方式");
        row.createCell(2).setCellValue("是否是固定物品");
        row.createCell(3).setCellValue("申请人");
        row.createCell(4).setCellValue("操作人");
        row.createCell(5).setCellValue("申请时间");
        row.createCell(6).setCellValue("状态");
        row.createCell(7).setCellValue("领用方式");
        JSONArray itemOutManages = this.getItemOutManage(pd, result);
        if (itemOutManages == null || itemOutManages.size() == 0) {
            return;
@@ -813,18 +825,19 @@
            dataObj = itemOutManages.getJSONObject(roomIndex);
            row.createCell(0).setCellValue(dataObj.getString("applyOrderId"));
            row.createCell(1).setCellValue(dataObj.getString("resourceNames"));
            row.createCell(2).setCellValue(dataObj.getString("userName"));
            row.createCell(3).setCellValue(dataObj.getString("createUserName"));
            row.createCell(4).setCellValue(dataObj.getString("createTime"));
            row.createCell(5).setCellValue(dataObj.getString("stateName"));
            row.createCell(2).setCellValue(dataObj.getString("isFixedName"));
            row.createCell(3).setCellValue(dataObj.getString("userName"));
            row.createCell(4).setCellValue(dataObj.getString("createUserName"));
            row.createCell(5).setCellValue(dataObj.getString("createTime"));
            row.createCell(6).setCellValue(dataObj.getString("stateName"));
            //获取出库方式
            String warehousingWay = dataObj.getString("warehousingWay");
            if (!StringUtil.isEmpty(warehousingWay) && warehousingWay.equals("10000")) {
                row.createCell(6).setCellValue("直接出库");
                row.createCell(7).setCellValue("直接出库");
            } else if (!StringUtil.isEmpty(warehousingWay) && warehousingWay.equals("20000")) {
                row.createCell(6).setCellValue("审核出库");
                row.createCell(7).setCellValue("审核出库");
            } else {
                row.createCell(6).setCellValue("--");
                row.createCell(7).setCellValue("--");
            }
        }
    }
@@ -837,12 +850,13 @@
        row.createCell(2).setCellValue("物品类型");
        row.createCell(3).setCellValue("物品名称");
        row.createCell(4).setCellValue("物品规格");
        row.createCell(5).setCellValue("转赠对象ID");
        row.createCell(6).setCellValue("转赠对象");
        row.createCell(7).setCellValue("原有库存");
        row.createCell(8).setCellValue("转赠数量");
        row.createCell(9).setCellValue("创建时间");
        row.createCell(10).setCellValue("备注");
        row.createCell(5).setCellValue("是否是固定物品");
        row.createCell(6).setCellValue("转赠对象ID");
        row.createCell(7).setCellValue("转赠对象");
        row.createCell(8).setCellValue("原有库存");
        row.createCell(9).setCellValue("转赠数量");
        row.createCell(10).setCellValue("创建时间");
        row.createCell(11).setCellValue("备注");
        JSONArray allocationUserStorehouses = this.getAllocationUserStorehouseManage(pd, result);
        if (allocationUserStorehouses == null || allocationUserStorehouses.size() == 0) {
            return;
@@ -856,12 +870,79 @@
            row.createCell(2).setCellValue(dataObj.getString("parentRstName") + ">" + dataObj.getString("rstName"));
            row.createCell(3).setCellValue(dataObj.getString("resName"));
            row.createCell(4).setCellValue(dataObj.getString("specName"));
            row.createCell(5).setCellValue(dataObj.getString("acceptUserId"));
            row.createCell(6).setCellValue(dataObj.getString("acceptUserName"));
            row.createCell(7).setCellValue(dataObj.getString("stock") + dataObj.getString("unitCodeName"));
            row.createCell(8).setCellValue(dataObj.getString("giveQuantity") + dataObj.getString("miniUnitCodeName"));
            row.createCell(9).setCellValue(dataObj.getString("createTime"));
            row.createCell(10).setCellValue(dataObj.getString("remark"));
            row.createCell(5).setCellValue(dataObj.getString("isFixedName"));
            row.createCell(6).setCellValue(dataObj.getString("acceptUserId"));
            row.createCell(7).setCellValue(dataObj.getString("acceptUserName"));
            row.createCell(8).setCellValue(dataObj.getString("stock") + dataObj.getString("unitCodeName"));
            row.createCell(9).setCellValue(dataObj.getString("giveQuantity") + dataObj.getString("miniUnitCodeName"));
            row.createCell(10).setCellValue(dataObj.getString("createTime"));
            row.createCell(11).setCellValue(dataObj.getString("remark"));
        }
    }

    private void inspectionTaskDetails(IPageData pd, ComponentValidateResult result, Workbook workbook) {
        Sheet sheet = workbook.createSheet("巡检明细");
        Row row = sheet.createRow(0);
        row.createCell(0).setCellValue("任务详情ID");
        row.createCell(1).setCellValue("巡检点名称");
        row.createCell(2).setCellValue("巡检计划名称");
        row.createCell(3).setCellValue("巡检路线名称");
        row.createCell(4).setCellValue("巡检人开始时间");
        row.createCell(5).setCellValue("巡检人结束时间");
        row.createCell(6).setCellValue("巡检点开始时间");
        row.createCell(7).setCellValue("巡检点结束时间");
        row.createCell(8).setCellValue("实际巡检时间");
        row.createCell(9).setCellValue("实际签到状态");
        row.createCell(10).setCellValue("计划巡检人");
        row.createCell(11).setCellValue("实际巡检人");
        row.createCell(12).setCellValue("巡检方式");
        row.createCell(13).setCellValue("任务状态");
        row.createCell(14).setCellValue("巡检点状态");
        row.createCell(15).setCellValue("巡检情况");
        JSONArray inspectionTaskDetails = this.getInspectionTaskDetails(pd, result);
        if (inspectionTaskDetails == null || inspectionTaskDetails.size() == 0) {
            return;
        }
        JSONObject dataObj = null;
        for (int roomIndex = 0; roomIndex < inspectionTaskDetails.size(); roomIndex++) {
            row = sheet.createRow(roomIndex + 1);
            dataObj = inspectionTaskDetails.getJSONObject(roomIndex);
            row.createCell(0).setCellValue(dataObj.getString("taskDetailId"));
            row.createCell(1).setCellValue(dataObj.getString("inspectionName"));
            row.createCell(2).setCellValue(dataObj.getString("inspectionPlanName"));
            row.createCell(3).setCellValue(dataObj.getString("routeName"));
            row.createCell(4).setCellValue(dataObj.getString("planInsTime"));
            row.createCell(5).setCellValue(dataObj.getString("planEndTime"));
            if (!StringUtil.isEmpty(dataObj.getString("pointStartTime"))) {
                row.createCell(6).setCellValue(dataObj.getString("pointStartTime"));
            } else {
                row.createCell(6).setCellValue("--");
            }
            if (!StringUtil.isEmpty(dataObj.getString("pointEndTime"))) {
                row.createCell(7).setCellValue(dataObj.getString("pointEndTime"));
            } else {
                row.createCell(7).setCellValue("--");
            }
            if (!StringUtil.isEmpty(dataObj.getString("inspectionTime"))) {
                row.createCell(8).setCellValue(dataObj.getString("inspectionTime"));
            } else {
                row.createCell(8).setCellValue("--");
            }
            row.createCell(9).setCellValue(dataObj.getString("inspectionStateName"));
            row.createCell(10).setCellValue(dataObj.getString("planUserName"));
            if (!StringUtil.isEmpty(dataObj.getString("actUserName"))) {
                row.createCell(11).setCellValue(dataObj.getString("actUserName"));
            } else {
                row.createCell(11).setCellValue("--");
            }
            row.createCell(12).setCellValue(dataObj.getString("signTypeName"));
            row.createCell(13).setCellValue(dataObj.getString("taskStateName"));
            row.createCell(14).setCellValue(dataObj.getString("stateName"));
            if (!StringUtil.isEmpty(dataObj.getString("description"))) {
                row.createCell(15).setCellValue(dataObj.getString("description"));
            } else {
                row.createCell(15).setCellValue("--");
            }
        }
    }

@@ -874,12 +955,14 @@
        row.createCell(3).setCellValue("物品类型");
        row.createCell(4).setCellValue("物品名称");
        row.createCell(5).setCellValue("物品规格");
        row.createCell(6).setCellValue("物品使用数量");
        row.createCell(7).setCellValue("物品价格");
        row.createCell(8).setCellValue("使用人ID");
        row.createCell(9).setCellValue("使用人");
        row.createCell(10).setCellValue("创建时间");
        row.createCell(11).setCellValue("备注");
        row.createCell(6).setCellValue("是否是固定物品");
        row.createCell(7).setCellValue("物品使用类型");
        row.createCell(8).setCellValue("物品使用数量");
        row.createCell(9).setCellValue("物品价格");
        row.createCell(10).setCellValue("使用人ID");
        row.createCell(11).setCellValue("使用人");
        row.createCell(12).setCellValue("创建时间");
        row.createCell(13).setCellValue("备注");
        JSONArray resourceStoreUseRecords = this.getResourceStoreUseRecordManage(pd, result);
        if (resourceStoreUseRecords == null || resourceStoreUseRecords.size() == 0) {
            return;
@@ -894,12 +977,14 @@
            row.createCell(3).setCellValue(dataObj.getString("parentRstName") + ">" + dataObj.getString("rstName"));
            row.createCell(4).setCellValue(dataObj.getString("resourceStoreName"));
            row.createCell(5).setCellValue(dataObj.getString("specName"));
            row.createCell(6).setCellValue(dataObj.getString("quantity") + dataObj.getString("miniUnitCodeName"));
            row.createCell(7).setCellValue(dataObj.getString("unitPrice"));
            row.createCell(8).setCellValue(dataObj.getString("createUserId"));
            row.createCell(9).setCellValue(dataObj.getString("createUserName"));
            row.createCell(10).setCellValue(dataObj.getString("createTime"));
            row.createCell(11).setCellValue(dataObj.getString("remark"));
            row.createCell(6).setCellValue(dataObj.getString("isFixedName"));
            row.createCell(7).setCellValue(dataObj.getString("stateName"));
            row.createCell(8).setCellValue(dataObj.getString("quantity") + dataObj.getString("miniUnitCodeName"));
            row.createCell(9).setCellValue(dataObj.getString("unitPrice"));
            row.createCell(10).setCellValue(dataObj.getString("createUserId"));
            row.createCell(11).setCellValue(dataObj.getString("createUserName"));
            row.createCell(12).setCellValue(dataObj.getString("createTime"));
            row.createCell(13).setCellValue(dataObj.getString("remark"));
        }
    }

@@ -1109,6 +1194,7 @@
        String apiUrl = "";
        ResponseEntity<String> responseEntity = null;
        JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
        reqJson.put("store-id", result.getStoreId());
        reqJson.put("page", 1);
        reqJson.put("row", 10000);
        apiUrl = "/reportQuestionAnswer/queryUserQuestionAnswerValue" + mapToUrlParam(reqJson);
@@ -1286,7 +1372,11 @@
        }
        JSONObject savedResourceStores = JSONObject.parseObject(responseEntity.getBody(), Feature.OrderedField);
        //获取限制条数的值
        int number = Integer.parseInt(MappingCache.getValue(DOMAIN_COMMON, EXPORT_NUMBER));
        String exportNumber = MappingCache.getValue(DOMAIN_COMMON, EXPORT_NUMBER);
        if (!StringUtil.isNumber(exportNumber)) {
            exportNumber = "10000";
        }
        int number = Integer.parseInt(exportNumber);
        if (savedResourceStores.getJSONArray("resourceStores").size() > number) {
            throw new IllegalArgumentException("导出数据超过限制条数" + number + "条，无法继续导出操作！");
        }
@@ -1365,6 +1455,29 @@
        return savedAllocationUserStorehouses.getJSONArray("data");
    }

    private JSONArray getInspectionTaskDetails(IPageData pd, ComponentValidateResult result) {
        String apiUrl = "";
        ResponseEntity<String> responseEntity = null;
        JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
        reqJson.put("page", 1);
        reqJson.put("row", 10000);
        apiUrl = "inspectionTaskDetail.listInspectionTaskDetails" + mapToUrlParam(reqJson);
        responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
        if (responseEntity.getStatusCode() != HttpStatus.OK) { //跳过 保存单元信息
            return null;
        }
        JSONObject savedInspectionTaskDetails = JSONObject.parseObject(responseEntity.getBody(), Feature.OrderedField);
        //获取限制条数的值
        int number = Integer.parseInt(MappingCache.getValue(DOMAIN_COMMON, EXPORT_NUMBER));
        if (savedInspectionTaskDetails.getJSONArray("inspectionTaskDetails").size() > number) {
            throw new IllegalArgumentException("导出数据超过限制条数" + number + "条，无法继续导出操作！");
        }
        if (!savedInspectionTaskDetails.containsKey("inspectionTaskDetails")) {
            return null;
        }
        return savedInspectionTaskDetails.getJSONArray("inspectionTaskDetails");
    }

    private JSONArray getResourceStoreUseRecordManage(IPageData pd, ComponentValidateResult result) {
        String apiUrl = "";
        ResponseEntity<String> responseEntity = null;
@@ -1417,7 +1530,7 @@
        JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
        reqJson.put("page", 1);
        reqJson.put("row", 10000);
        apiUrl = "reportFeeMonthStatistics/queryPayFeeDeposit" + mapToUrlParam(reqJson);
        apiUrl = "/reportFeeMonthStatistics/queryPayFeeDeposit" + mapToUrlParam(reqJson);
        responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
        if (responseEntity.getStatusCode() != HttpStatus.OK) { //跳过 保存单元信息
            return null;
@@ -1498,8 +1611,15 @@
        row.createCell(4).setCellValue("费用项");
        row.createCell(5).setCellValue("费用开始时间");
        row.createCell(6).setCellValue("费用结束时间");
        row.createCell(7).setCellValue("应收金额");
        row.createCell(8).setCellValue("实收金额");
        row.createCell(7).setCellValue("历史欠费(单位:元)");
        row.createCell(8).setCellValue("当月应收(单位:元)");
        row.createCell(9).setCellValue("应收合计(单位:元)");
        row.createCell(10).setCellValue("当月实收(单位:元)");
        row.createCell(11).setCellValue("欠费追回(单位:元)");
        row.createCell(12).setCellValue("预交费用(单位:元)");
        row.createCell(13).setCellValue("实收合计(单位:元)");
        row.createCell(14).setCellValue("欠费金额(单位:元)");
        row.createCell(15).setCellValue("更新时间");
        //查询楼栋信息
        JSONArray rooms = this.getReportFeeDetail(pd, result);
        if (rooms == null || rooms.size() == 0) {
@@ -1516,8 +1636,20 @@
            row.createCell(4).setCellValue(dataObj.getString("feeName"));
            row.createCell(5).setCellValue(dataObj.getString("feeCreateTime"));
            row.createCell(6).setCellValue(dataObj.getString("deadlineTime"));
            row.createCell(7).setCellValue(dataObj.getString("receivableAmount"));
            row.createCell(8).setCellValue(dataObj.getString("receivedAmount"));
            row.createCell(7).setCellValue(dataObj.getString("hisOweAmount"));
            row.createCell(8).setCellValue(dataObj.getString("curReceivableAmount"));
            BigDecimal hisOweAmount = new BigDecimal(dataObj.getString("hisOweAmount"));
            BigDecimal curReceivableAmount = new BigDecimal(dataObj.getString("curReceivableAmount"));
            row.createCell(9).setCellValue(hisOweAmount.add(curReceivableAmount).toString());
            row.createCell(10).setCellValue(dataObj.getString("curReceivedAmount"));
            row.createCell(11).setCellValue(dataObj.getString("hisOweReceivedAmount"));
            row.createCell(12).setCellValue(dataObj.getString("preReceivedAmount"));
            BigDecimal curReceivedAmount = new BigDecimal(dataObj.getString("curReceivedAmount"));
            BigDecimal hisOweReceivedAmount = new BigDecimal(dataObj.getString("hisOweReceivedAmount"));
            BigDecimal preReceivedAmount = new BigDecimal(dataObj.getString("preReceivedAmount"));
            row.createCell(13).setCellValue(hisOweReceivedAmount.add(preReceivedAmount).add(curReceivedAmount).toString());
            row.createCell(14).setCellValue(hisOweAmount.add(curReceivableAmount).subtract(curReceivedAmount).subtract(hisOweReceivedAmount).toString());
            row.createCell(15).setCellValue(dataObj.getString("updateTime"));
        }
    }

@@ -1575,10 +1707,13 @@
        row.createCell(2).setCellValue("费用项");
        row.createCell(3).setCellValue("历史欠费(单位:元)");
        row.createCell(4).setCellValue("当月应收(单位:元)");
        row.createCell(5).setCellValue("当月实收(单位:元)");
        row.createCell(6).setCellValue("欠费追回(单位:元)");
        row.createCell(7).setCellValue("预交费用(单位:元)");
        row.createCell(8).setCellValue("欠费金额(单位:元)");
        row.createCell(5).setCellValue("应收合计(单位:元)");
        row.createCell(6).setCellValue("当月实收(单位:元)");
        row.createCell(7).setCellValue("欠费追回(单位:元)");
        row.createCell(8).setCellValue("预交费用(单位:元)");
        row.createCell(9).setCellValue("实收合计(单位:元)");
        row.createCell(10).setCellValue("欠费金额(单位:元)");
        row.createCell(11).setCellValue("更新时间");
        //查询楼栋信息
        JSONArray rooms = this.getReportFeeBreakdown(pd, result);
        if (rooms == null || rooms.size() == 0) {
@@ -1594,14 +1729,22 @@
            row.createCell(2).setCellValue(dataObj.getString("feeName"));
            row.createCell(3).setCellValue(dataObj.getString("hisOweAmount"));
            row.createCell(4).setCellValue(dataObj.getString("curReceivableAmount"));
            row.createCell(5).setCellValue(dataObj.getString("curReceivedAmount"));
            row.createCell(6).setCellValue(dataObj.getString("hisOweReceivedAmount"));
            row.createCell(7).setCellValue(dataObj.getString("preReceivedAmount"));
            BigDecimal hisOweAmount = new BigDecimal(dataObj.getString("hisOweAmount"));
            BigDecimal curReceivableAmount = new BigDecimal(dataObj.getString("curReceivableAmount"));
            row.createCell(5).setCellValue(hisOweAmount.add(curReceivableAmount).toString());
            row.createCell(6).setCellValue(dataObj.getString("curReceivedAmount"));
            row.createCell(7).setCellValue(dataObj.getString("hisOweReceivedAmount"));
            row.createCell(8).setCellValue(dataObj.getString("preReceivedAmount"));
            BigDecimal curReceivedAmount = new BigDecimal(dataObj.getString("curReceivedAmount"));
            BigDecimal hisOweReceivedAmount = new BigDecimal(dataObj.getString("hisOweReceivedAmount"));
            BigDecimal preReceivedAmount = new BigDecimal(dataObj.getString("preReceivedAmount"));
            row.createCell(9).setCellValue(hisOweReceivedAmount.add(preReceivedAmount).add(curReceivedAmount).toString());
            oweFeeDec = new BigDecimal(Double.parseDouble(dataObj.getString("hisOweAmount")))
                    .add(new BigDecimal(Double.parseDouble(dataObj.getString("curReceivableAmount"))))
                    .subtract(new BigDecimal(Double.parseDouble(dataObj.getString("curReceivedAmount"))))
                    .subtract(new BigDecimal(Double.parseDouble(dataObj.getString("hisOweReceivedAmount")))).setScale(2, BigDecimal.ROUND_HALF_UP);
            row.createCell(8).setCellValue(oweFeeDec.doubleValue() < 0 ? "0" : oweFeeDec.doubleValue() + "");
            row.createCell(10).setCellValue(oweFeeDec.doubleValue() < 0 ? "0" : oweFeeDec.doubleValue() + "");
            row.createCell(11).setCellValue(dataObj.getString("updateTime"));
        }
    }

@@ -1636,10 +1779,13 @@
        row.createCell(2).setCellValue("单元");
        row.createCell(3).setCellValue("历史欠费(单位:元)");
        row.createCell(4).setCellValue("当月应收(单位:元)");
        row.createCell(5).setCellValue("当月实收(单位:元)");
        row.createCell(6).setCellValue("欠费追回(单位:元)");
        row.createCell(7).setCellValue("预交费用(单位:元)");
        row.createCell(8).setCellValue("欠费金额(单位:元)");
        row.createCell(5).setCellValue("应收合计(单位:元)");
        row.createCell(6).setCellValue("当月实收(单位:元)");
        row.createCell(7).setCellValue("欠费追回(单位:元)");
        row.createCell(8).setCellValue("预交费用(单位:元)");
        row.createCell(9).setCellValue("实收合计(单位:元)");
        row.createCell(10).setCellValue("欠费金额(单位:元)");
        row.createCell(11).setCellValue("更新时间");
        //查询楼栋信息
        JSONArray rooms = this.getReportFloorUnitFeeSummary(pd, result);
        if (rooms == null || rooms.size() == 0) {
@@ -1655,14 +1801,22 @@
            row.createCell(2).setCellValue(dataObj.getString("unitNum") + "单元");
            row.createCell(3).setCellValue(dataObj.getString("hisOweAmount"));
            row.createCell(4).setCellValue(dataObj.getString("curReceivableAmount"));
            row.createCell(5).setCellValue(dataObj.getString("curReceivedAmount"));
            row.createCell(6).setCellValue(dataObj.getString("hisOweReceivedAmount"));
            row.createCell(7).setCellValue(dataObj.getString("preReceivedAmount"));
            BigDecimal hisOweAmount = new BigDecimal(dataObj.getString("hisOweAmount"));
            BigDecimal curReceivableAmount = new BigDecimal(dataObj.getString("curReceivableAmount"));
            row.createCell(5).setCellValue(hisOweAmount.add(curReceivableAmount).toString());
            row.createCell(6).setCellValue(dataObj.getString("curReceivedAmount"));
            row.createCell(7).setCellValue(dataObj.getString("hisOweReceivedAmount"));
            row.createCell(8).setCellValue(dataObj.getString("preReceivedAmount"));
            BigDecimal hisOweReceivedAmount = new BigDecimal(dataObj.getString("hisOweReceivedAmount"));
            BigDecimal preReceivedAmount = new BigDecimal(dataObj.getString("preReceivedAmount"));
            BigDecimal curReceivedAmount = new BigDecimal(dataObj.getString("curReceivedAmount"));
            row.createCell(9).setCellValue(hisOweReceivedAmount.add(preReceivedAmount).add(curReceivedAmount).toString());
            oweFeeDec = new BigDecimal(Double.parseDouble(dataObj.getString("hisOweAmount")))
                    .add(new BigDecimal(Double.parseDouble(dataObj.getString("curReceivableAmount"))))
                    .subtract(new BigDecimal(Double.parseDouble(dataObj.getString("curReceivedAmount"))))
                    .subtract(new BigDecimal(Double.parseDouble(dataObj.getString("hisOweReceivedAmount")))).setScale(2, BigDecimal.ROUND_HALF_UP);
            row.createCell(8).setCellValue(oweFeeDec.doubleValue() < 0 ? "0" : oweFeeDec.doubleValue() + "");
            row.createCell(10).setCellValue(oweFeeDec.doubleValue() < 0 ? "0" : oweFeeDec.doubleValue() + "");
            row.createCell(11).setCellValue(dataObj.getString("updateTime"));
        }
    }

@@ -1732,10 +1886,14 @@
        row.createCell(0).setCellValue("日期");
        row.createCell(1).setCellValue("历史欠费(单位:元)");
        row.createCell(2).setCellValue("当月应收(单位:元)");
        row.createCell(3).setCellValue("当月实收(单位:元)");
        row.createCell(4).setCellValue("欠费追回(单位:元)");
        row.createCell(5).setCellValue("预交费用(单位:元)");
        row.createCell(6).setCellValue("欠费金额(单位:元)");
        row.createCell(3).setCellValue("应收合计(单位:元)");
        row.createCell(4).setCellValue("当月实收(单位:元)");
        row.createCell(5).setCellValue("欠费追回(单位:元)");
        row.createCell(6).setCellValue("预交费用(单位:元)");
        row.createCell(7).setCellValue("实收合计(单位:元)");
        row.createCell(8).setCellValue("欠费金额(单位:元)");
        row.createCell(9).setCellValue("收费率");
        row.createCell(10).setCellValue("更新时间");
        //查询楼栋信息
        JSONArray rooms = this.getReportFeeSummaryFee(pd, componentValidateResult);
        if (rooms == null || rooms.size() == 0) {
@@ -1749,14 +1907,23 @@
            row.createCell(0).setCellValue(dataObj.getString("feeYear") + "年" + dataObj.getString("feeMonth") + "月");
            row.createCell(1).setCellValue(dataObj.getString("hisOweAmount"));
            row.createCell(2).setCellValue(dataObj.getString("curReceivableAmount"));
            row.createCell(3).setCellValue(dataObj.getString("curReceivedAmount"));
            row.createCell(4).setCellValue(dataObj.getString("hisOweReceivedAmount"));
            row.createCell(5).setCellValue(dataObj.getString("preReceivedAmount"));
            BigDecimal hisOweAmount = new BigDecimal(dataObj.getString("hisOweAmount"));
            BigDecimal curReceivableAmount = new BigDecimal(dataObj.getString("curReceivableAmount"));
            row.createCell(3).setCellValue(hisOweAmount.add(curReceivableAmount).toString());
            row.createCell(4).setCellValue(dataObj.getString("curReceivedAmount"));
            row.createCell(5).setCellValue(dataObj.getString("hisOweReceivedAmount"));
            row.createCell(6).setCellValue(dataObj.getString("preReceivedAmount"));
            BigDecimal curReceivedAmount = new BigDecimal(dataObj.getString("curReceivedAmount"));
            BigDecimal hisOweReceivedAmount = new BigDecimal(dataObj.getString("hisOweReceivedAmount"));
            BigDecimal preReceivedAmount = new BigDecimal(dataObj.getString("preReceivedAmount"));
            row.createCell(7).setCellValue(curReceivedAmount.add(hisOweReceivedAmount).add(preReceivedAmount).toString());
            oweFeeDec = new BigDecimal(Double.parseDouble(dataObj.getString("hisOweAmount")))
                    .add(new BigDecimal(Double.parseDouble(dataObj.getString("curReceivableAmount"))))
                    .subtract(new BigDecimal(Double.parseDouble(dataObj.getString("curReceivedAmount"))))
                    .subtract(new BigDecimal(Double.parseDouble(dataObj.getString("hisOweReceivedAmount")))).setScale(2, BigDecimal.ROUND_HALF_UP);
            row.createCell(6).setCellValue(oweFeeDec.doubleValue() < 0 ? "0" : oweFeeDec.doubleValue() + "");
            row.createCell(8).setCellValue(oweFeeDec.doubleValue() < 0 ? "0" : oweFeeDec.doubleValue() + "");
            row.createCell(9).setCellValue(dataObj.getString("chargeRate"));
            row.createCell(10).setCellValue(dataObj.getString("updateTime"));
        }
    }