From ad7623b1e809e821f2a83f090a4e1ea6e2837add Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期三, 19 十月 2022 01:59:09 +0800
Subject: [PATCH] 导出支持异步队里方式

---
 service-report/src/main/java/com/java110/report/bmo/reportFeeMonthStatistics/impl/GetReportFeeMonthStatisticsBMOImpl.java |  312 +--------------------------------------------------
 1 files changed, 10 insertions(+), 302 deletions(-)

diff --git a/service-report/src/main/java/com/java110/report/bmo/reportFeeMonthStatistics/impl/GetReportFeeMonthStatisticsBMOImpl.java b/service-report/src/main/java/com/java110/report/bmo/reportFeeMonthStatistics/impl/GetReportFeeMonthStatisticsBMOImpl.java
index c18ecff..efba38e 100755
--- a/service-report/src/main/java/com/java110/report/bmo/reportFeeMonthStatistics/impl/GetReportFeeMonthStatisticsBMOImpl.java
+++ b/service-report/src/main/java/com/java110/report/bmo/reportFeeMonthStatistics/impl/GetReportFeeMonthStatisticsBMOImpl.java
@@ -17,6 +17,7 @@
 import com.java110.intf.community.IRepairInnerServiceSMO;
 import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
 import com.java110.intf.fee.IFeeDetailInnerServiceSMO;
+import com.java110.intf.report.IQueryPayFeeDetailInnerServiceSMO;
 import com.java110.intf.report.IReportFeeMonthStatisticsInnerServiceSMO;
 import com.java110.intf.user.IOwnerInnerServiceSMO;
 import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
@@ -65,6 +66,9 @@
 
     @Autowired
     private IFeeDetailInnerServiceSMO feeDetailInnerServiceSMOImpl;
+
+    @Autowired
+    private IQueryPayFeeDetailInnerServiceSMO queryPayFeeDetailInnerServiceSMOImpl;
 
     /**
      * @param reportFeeMonthStatisticsDto
@@ -401,310 +405,14 @@
         return responseEntity;
     }
 
+    /**
+     * 鍓嶅彴鏌ヨ鍒嗛〉鏌ヨ
+     * @param reportFeeMonthStatisticsDto
+     * @return
+     */
     @Override
     public ResponseEntity<String> queryPayFeeDetail(ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto) {
-
-        JSONObject countInfo = reportFeeMonthStatisticsInnerServiceSMOImpl.queryPayFeeDetailCount(reportFeeMonthStatisticsDto);
-
-        int count = Integer.parseInt(countInfo.get("count").toString());
-
-        List<ReportFeeMonthStatisticsDto> reportFeeMonthStatisticsDtos = null;
-        ReportFeeMonthStatisticsTotalDto reportFeeMonthStatisticsTotalDto = new ReportFeeMonthStatisticsTotalDto();
-        List<ReportFeeMonthStatisticsDto> reportList = new ArrayList<>();
-        //鏌ヨ璇ュ皬鍖轰笅鐨勮垂鐢ㄩ」鐩�
-        FeeConfigDto feeConfigDto = new FeeConfigDto();
-        feeConfigDto.setCommunityId(reportFeeMonthStatisticsDto.getCommunityId());
-        List<FeeConfigDto> feeConfigDtos = reportFeeMonthStatisticsInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
-        //搴旀敹鎬婚噾棰�(澶ц)
-        Double allReceivableAmount = 0.0;
-        //瀹炴敹閲戦(澶ц)
-        Double allReceivedAmount = 0.0;
-        //浼樻儬閲戦(澶ц)
-        Double allPreferentialAmount = 0.0;
-        //鍑忓厤閲戦(澶ц)
-        Double allDeductionAmount = 0.0;
-        //婊炵撼閲�(澶ц)
-        Double allLateFee = 0.0;
-        //绌虹疆鎴挎墦鎶�(澶ц)
-        Double allVacantHousingDiscount = 0.0;
-        //绌虹疆鎴垮噺鍏�(澶ц)
-        Double allVacantHousingReduction = 0.0;
-        //璧犻�侀噾棰�(澶ц)
-        Double allGiftAmount = 0.0;
-        //鍚村鏂� 娉ㄩ噴 鎰熻鍜屼笂闈㈢殑369 鍔熻兘閲嶅
-        //int size = 0;
-        if (count > 0) {
-            //鏌ヨ缂磋垂鏄庣粏
-            reportFeeMonthStatisticsDtos = reportFeeMonthStatisticsInnerServiceSMOImpl.queryPayFeeDetail(reportFeeMonthStatisticsDto);
-            //鍚村鏂� 娉ㄩ噴 鎰熻鍜屼笂闈㈢殑369 鍔熻兘閲嶅
-//            if (reportFeeMonthStatisticsDtos != null && reportFeeMonthStatisticsDtos.size() > 0) {
-//                //鏌ヨ鎵�鏈夌即璐规槑缁嗚褰�
-//                ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto1 = BeanConvertUtil.covertBean(reportFeeMonthStatisticsDto, ReportFeeMonthStatisticsDto.class);
-//                reportFeeMonthStatisticsDto1.setPage(PageDto.DEFAULT_PAGE);
-//                List<ReportFeeMonthStatisticsDto> reportFeeMonthStatisticsDtos1 = reportFeeMonthStatisticsInnerServiceSMOImpl.queryPayFeeDetail(reportFeeMonthStatisticsDto1);
-//                size = reportFeeMonthStatisticsDtos1.size();
-//            }
-            //鏌ヨ搴旀敹銆佸疄鏀舵�婚噾棰�(澶ц)
-            List<ReportFeeMonthStatisticsDto> reportFeeMonthStatisticsList = reportFeeMonthStatisticsInnerServiceSMOImpl.queryAllPayFeeDetail(reportFeeMonthStatisticsDto);
-            //鏌ヨ(浼樻儬銆佸噺鍏嶃�佹粸绾抽噾銆佺┖缃埧鎵撴姌銆佺┖缃埧鍑忓厤閲戦绛�)澶ц鎬婚噾棰�
-            List<ReportFeeMonthStatisticsDto> reportFeeMonthStatisticsSum = reportFeeMonthStatisticsInnerServiceSMOImpl.queryPayFeeDetailSum(reportFeeMonthStatisticsDto);
-            allReceivableAmount = Double.valueOf(reportFeeMonthStatisticsList.get(0).getAllReceivableAmount());
-            allReceivedAmount = Double.valueOf(reportFeeMonthStatisticsList.get(0).getAllReceivedAmount());
-            for (ReportFeeMonthStatisticsDto reportFeeMonthStatistics : reportFeeMonthStatisticsSum) {
-                //杩欓噷鏄煡璇㈠嚭鐨勯噾棰濇�诲拰
-                String discountPrice = reportFeeMonthStatistics.getDiscountPrice();
-                //浼樻儬閲戦(澶ц)
-                if (!StringUtil.isEmpty(reportFeeMonthStatistics.getDiscountSmallType()) && reportFeeMonthStatistics.getDiscountSmallType().equals("1")) {
-                    allPreferentialAmount = Double.valueOf(discountPrice);
-                }
-                //鍑忓厤閲戦(澶ц)
-                if (!StringUtil.isEmpty(reportFeeMonthStatistics.getDiscountSmallType()) && reportFeeMonthStatistics.getDiscountSmallType().equals("2")) {
-                    allDeductionAmount = Double.valueOf(discountPrice);
-                }
-                //婊炵撼閲�(澶ц)
-                if (!StringUtil.isEmpty(reportFeeMonthStatistics.getDiscountSmallType()) && reportFeeMonthStatistics.getDiscountSmallType().equals("3")) {
-                    allLateFee = Double.valueOf(discountPrice);
-                }
-                //绌虹疆鎴挎墦鎶橀噾棰�(澶ц)
-                if (!StringUtil.isEmpty(reportFeeMonthStatistics.getDiscountSmallType()) && reportFeeMonthStatistics.getDiscountSmallType().equals("4")) {
-                    allVacantHousingDiscount = Double.valueOf(discountPrice);
-                }
-                //绌虹疆鎴垮噺鍏嶉噾棰�(澶ц)
-                if (!StringUtil.isEmpty(reportFeeMonthStatistics.getDiscountSmallType()) && reportFeeMonthStatistics.getDiscountSmallType().equals("5")) {
-                    allVacantHousingReduction = Double.valueOf(discountPrice);
-                }
-                //璧犻�侀噾棰�(澶ц)
-                if (!StringUtil.isEmpty(reportFeeMonthStatistics.getDiscountSmallType()) && reportFeeMonthStatistics.getDiscountSmallType().equals("6")) {
-                    allGiftAmount = Double.valueOf(discountPrice);
-                }
-            }
-            //搴旀敹鎬婚噾棰�(灏忚)
-            Double totalReceivableAmount = 0.0;
-            //瀹炴敹鎬婚噾棰�(灏忚)
-            Double totalReceivedAmount = 0.0;
-            //浼樻儬閲戦(灏忚)
-            Double totalPreferentialAmount = 0.0;
-            //鍑忓厤閲戦(灏忚)
-            Double totalDeductionAmount = 0.0;
-            //绌虹疆鎴挎墦鎶橀噾棰�(灏忚)
-            Double totalVacantHousingDiscount = 0.0;
-            //绌虹疆鎴垮噺鍏嶉噾棰�(灏忚)
-            Double totalVacantHousingReduction = 0.0;
-            //璧犻�侀噾棰�(灏忚)
-            Double totalGiftAmount = 0.0;
-            //婊炵撼閲�(灏忚)
-            Double totalLateFee = 0.0;
-            List<String> ownerIds = new ArrayList<>();
-            for (ReportFeeMonthStatisticsDto reportFeeMonthStatistics : reportFeeMonthStatisticsDtos) {
-                FeeDetailDto feeDetailDto = new FeeDetailDto();
-                feeDetailDto.setDetailId(reportFeeMonthStatistics.getDetailId());
-                List<FeeDetailDto> feeDetailDtos = feeDetailInnerServiceSMOImpl.queryFeeDetails(feeDetailDto);
-                Assert.listOnlyOne(feeDetailDtos, "鏌ヨ璐圭敤鏄庣粏琛ㄩ敊璇�");
-                reportFeeMonthStatistics.setReceivableAmount(feeDetailDtos.get(0).getReceivableAmount());
-                reportFeeMonthStatistics.setPayableAmount(feeDetailDtos.get(0).getPayableAmount());
-                //搴旀敹閲戦
-                Double receivableAmount = Double.valueOf(reportFeeMonthStatistics.getReceivableAmount());
-                //瀹炴敹閲戦
-                Double receivedAmount = Double.valueOf(reportFeeMonthStatistics.getReceivedAmount());
-                totalReceivableAmount = totalReceivableAmount + receivableAmount;
-                totalReceivedAmount = totalReceivedAmount + receivedAmount;
-
-                if (FeeDto.PAYER_OBJ_TYPE_CAR.equals(reportFeeMonthStatistics.getPayerObjType())) {
-                    ownerIds.add(reportFeeMonthStatistics.getOwnerId());
-                }
-
-                // 鏈�澶ц褰曟椂 灏卞幓鍒锋柊
-                //濡傛灉鏄溅浣嶅埛鎴垮眿淇℃伅
-                if (ownerIds.size() == MAX_ROWS) {
-                    refreshReportFeeMonthStatistics(ownerIds, reportFeeMonthStatisticsDtos);
-                    ownerIds = new ArrayList<>();
-                }
-
-                //浼樻儬閲戦
-                if (!StringUtil.isEmpty(reportFeeMonthStatistics.getDiscountSmallType()) && reportFeeMonthStatistics.getDiscountSmallType().equals("1")) {
-                    //鑾峰彇浼樻儬閲戦
-                    Double discountPrice = Double.valueOf(reportFeeMonthStatistics.getDiscountPrice());
-                    totalPreferentialAmount = totalPreferentialAmount + discountPrice;
-                    //浼樻儬閲戦
-                    reportFeeMonthStatistics.setPreferentialAmount(reportFeeMonthStatistics.getDiscountPrice());
-                } else {
-                    reportFeeMonthStatistics.setPreferentialAmount("0");
-                }
-                //鍑忓厤閲戦
-                if (!StringUtil.isEmpty(reportFeeMonthStatistics.getDiscountSmallType()) && reportFeeMonthStatistics.getDiscountSmallType().equals("2")) {
-                    //鑾峰彇鍑忓厤閲戦
-                    Double discountPrice = Double.valueOf(reportFeeMonthStatistics.getDiscountPrice());
-                    totalDeductionAmount = totalDeductionAmount + discountPrice;
-                    //鍑忓厤閲戦
-                    reportFeeMonthStatistics.setDeductionAmount(reportFeeMonthStatistics.getDiscountPrice());
-                } else {
-                    reportFeeMonthStatistics.setDeductionAmount("0");
-                }
-                //婊炵撼閲�
-                if (!StringUtil.isEmpty(reportFeeMonthStatistics.getDiscountSmallType()) && reportFeeMonthStatistics.getDiscountSmallType().equals("3")) {
-                    //鑾峰彇婊炵撼閲戦噾棰�
-                    Double discountPrice = (Double.valueOf(reportFeeMonthStatistics.getDiscountPrice()));
-                    totalLateFee = totalLateFee + discountPrice;
-                    //婊炵撼閲�
-                    reportFeeMonthStatistics.setLateFee(reportFeeMonthStatistics.getDiscountPrice());
-                } else {
-                    reportFeeMonthStatistics.setLateFee("0");
-                }
-                //绌虹疆鎴挎墦鎶�
-                if (!StringUtil.isEmpty(reportFeeMonthStatistics.getDiscountSmallType()) && reportFeeMonthStatistics.getDiscountSmallType().equals("4")) {
-                    //绌虹疆鎴挎墦鎶橀噾棰�
-                    Double discountPrice = Double.valueOf(reportFeeMonthStatistics.getDiscountPrice());
-                    totalVacantHousingDiscount = totalVacantHousingDiscount + discountPrice;
-                    //绌虹疆鎴挎墦鎶�
-                    reportFeeMonthStatistics.setVacantHousingDiscount(reportFeeMonthStatistics.getDiscountPrice());
-                } else {
-                    reportFeeMonthStatistics.setVacantHousingDiscount("0");
-                }
-                //绌虹疆鎴垮噺鍏�
-                if (!StringUtil.isEmpty(reportFeeMonthStatistics.getDiscountSmallType()) && reportFeeMonthStatistics.getDiscountSmallType().equals("5")) {
-                    //绌虹疆鎴垮噺鍏嶉噾棰�
-                    Double discountPrice = Double.valueOf(reportFeeMonthStatistics.getDiscountPrice());
-                    totalVacantHousingReduction = totalVacantHousingReduction + discountPrice;
-                    //绌虹疆鎴垮噺鍏�
-                    reportFeeMonthStatistics.setVacantHousingReduction(reportFeeMonthStatistics.getDiscountPrice());
-                } else {
-                    reportFeeMonthStatistics.setVacantHousingReduction("0");
-                }
-                //璧犻�侀噾棰�
-                if (!StringUtil.isEmpty(reportFeeMonthStatistics.getDiscountSmallType()) && reportFeeMonthStatistics.getDiscountSmallType().equals("6")) {
-                    //璧犻�侀噾棰�
-                    Double discountPrice = Double.valueOf(reportFeeMonthStatistics.getDiscountPrice());
-                    totalGiftAmount = totalGiftAmount + discountPrice;
-                    //璧犻�侀噾棰�
-                    reportFeeMonthStatistics.setGiftAmount(reportFeeMonthStatistics.getDiscountPrice());
-                } else {
-                    reportFeeMonthStatistics.setGiftAmount("0");
-                }
-                if (FeeDto.PAYER_OBJ_TYPE_ROOM.equals(reportFeeMonthStatistics.getPayerObjType())) {
-                    reportFeeMonthStatistics.setObjName(reportFeeMonthStatistics.getFloorNum()
-                            + "鏍�" + reportFeeMonthStatistics.getUnitNum()
-                            + "鍗曞厓" + reportFeeMonthStatistics.getRoomNum() + "瀹�");
-                } else if (FeeDto.PAYER_OBJ_TYPE_CAR.equals(reportFeeMonthStatistics.getPayerObjType())) {
-                    reportFeeMonthStatistics.setObjName(reportFeeMonthStatistics.getCarNum());
-                } else {
-                    reportFeeMonthStatistics.setObjName(reportFeeMonthStatistics.getContractCode());
-
-                }
-                if (!StringUtil.isEmpty(reportFeeMonthStatistics.getImportFeeName())) {
-                    reportFeeMonthStatistics.setFeeName(reportFeeMonthStatistics.getImportFeeName());
-                }
-                //璐圭敤椤圭洰
-                reportFeeMonthStatistics.setFeeConfigDtos(feeConfigDtos);
-                if (!StringUtil.isEmpty(reportFeeMonthStatistics.getRepairId())) {
-                    RepairDto repairDto = new RepairDto();
-                    repairDto.setRepairId(reportFeeMonthStatistics.getRepairId());
-                    //鏌ヨ鎶ヤ慨鍗�
-                    List<RepairDto> repairDtos = repairInnerServiceSMOImpl.queryRepairs(repairDto);
-                    //Assert.listOnlyOne(repairDtos, "鏌ヨ鎶ヤ慨鍗曢敊璇紒");
-                    if (repairDtos != null && repairDtos.size() == 1) {
-                        if (!StringUtil.isEmpty(repairDtos.get(0).getRepairObjType()) && repairDtos.get(0).getRepairObjType().equals("004")) {
-                            OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
-                            ownerRoomRelDto.setRoomId(repairDtos.get(0).getRepairObjId());
-                            List<OwnerRoomRelDto> ownerRoomRelDtos = ownerRoomRelInnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
-                            if (ownerRoomRelDtos != null && ownerRoomRelDtos.size() == 0) { //鏌ヨ鏉℃暟涓�0鏉�
-                                OwnerRoomRelDto ownerRoomRel = new OwnerRoomRelDto();
-                                ownerRoomRel.setRoomId(repairDtos.get(0).getRepairObjId());
-                                ownerRoomRel.setStatusCd("1"); //鐪嬬湅涓氫富鎴垮眿鍏崇郴鏁版嵁鏄惁鍒犻櫎浜�
-                                List<OwnerRoomRelDto> ownerRoomRels = ownerRoomRelInnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRel);
-                                Assert.listOnlyOne(ownerRoomRels, "鏌ヨ涓氫富鎴垮眿鍏崇郴琛ㄩ敊璇紒");
-                                OwnerDto owner = new OwnerDto();
-                                owner.setOwnerId(ownerRoomRels.get(0).getOwnerId());
-                                owner.setOwnerTypeCd("1001"); //涓氫富鏈汉
-                                List<OwnerDto> owners = ownerInnerServiceSMOImpl.queryOwners(owner);
-                                if (owners != null && owners.size() == 0) { //鏌ュ嚭鏉℃暟涓�0鏉�
-                                    //鍒ゆ柇涓氫富鏄惁鍒犻櫎浜�
-                                    OwnerDto newOwner = new OwnerDto();
-                                    newOwner.setOwnerId(ownerRoomRels.get(0).getOwnerId());
-                                    newOwner.setOwnerTypeCd("1001"); //涓氫富鏈汉
-                                    newOwner.setStatusCd("1");
-                                    List<OwnerDto> newOwners = ownerInnerServiceSMOImpl.queryOwners(newOwner);
-                                    Assert.listOnlyOne(newOwners, "鏌ヨ涓氫富淇℃伅閿欒锛�");
-                                    reportFeeMonthStatistics.setOwnerName(newOwners.get(0).getName());
-                                } else if (owners != null && owners.size() == 1) { //鏌ュ嚭鏉℃暟涓�1鏉�
-                                    reportFeeMonthStatistics.setOwnerName(owners.get(0).getName());
-                                } else {
-                                    throw new IllegalArgumentException("鏌ヨ涓氫富淇℃伅閿欒锛�");
-                                }
-                            } else if (ownerRoomRelDtos != null && ownerRoomRelDtos.size() == 1) { //鏌ヨ鏉℃暟涓�1鏉�
-                                OwnerDto ownerDto = new OwnerDto();
-                                ownerDto.setOwnerId(ownerRoomRelDtos.get(0).getOwnerId());
-                                ownerDto.setOwnerTypeCd("1001"); //涓氫富鏈汉
-                                List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwners(ownerDto);
-                                if (ownerDtos != null && ownerDtos.size() == 0) { //涓氫富鏌ヨ鏉℃暟涓�0鏉�
-                                    //鍒ゆ柇涓氫富鏄惁鍒犻櫎浜�
-                                    OwnerDto newOwner = new OwnerDto();
-                                    newOwner.setOwnerId(ownerRoomRelDtos.get(0).getOwnerId());
-                                    newOwner.setOwnerTypeCd("1001"); //涓氫富鏈汉
-                                    newOwner.setStatusCd("1");
-                                    List<OwnerDto> newOwners = ownerInnerServiceSMOImpl.queryOwners(newOwner);
-                                    Assert.listOnlyOne(newOwners, "鏌ヨ涓氫富淇℃伅閿欒锛�");
-                                    reportFeeMonthStatistics.setOwnerName(newOwners.get(0).getName());
-                                } else if (ownerDtos != null || ownerDtos.size() == 1) {
-                                    reportFeeMonthStatistics.setOwnerName(ownerDtos.get(0).getName());
-                                } else {
-                                    throw new IllegalArgumentException("鏌ヨ涓氫富淇℃伅閿欒锛�");
-                                }
-                            } else {
-                                throw new IllegalArgumentException("鏌ヨ涓氫富鎴垮眿鍏崇郴琛ㄩ敊璇紒");
-                            }
-                        }
-                    }
-                }
-                if (!hasInReportListAndMerge(reportList, reportFeeMonthStatistics)) {
-                    reportList.add(reportFeeMonthStatistics);
-                }
-            }
-
-            //濡傛灉鏄溅浣嶅埛鎴垮眿淇℃伅
-            if (ownerIds.size() > 0) {
-                refreshReportFeeMonthStatistics(ownerIds, reportFeeMonthStatisticsDtos);
-            }
-
-            //搴旀敹鎬婚噾棰�(灏忚)
-            reportFeeMonthStatisticsTotalDto.setTotalReceivableAmount(String.format("%.2f", totalReceivableAmount));
-            //瀹炴敹閲戦(灏忚)
-            reportFeeMonthStatisticsTotalDto.setTotalReceivedAmount(String.format("%.2f", totalReceivedAmount));
-            //浼樻儬閲戦(灏忚)
-            reportFeeMonthStatisticsTotalDto.setTotalPreferentialAmount(String.format("%.2f", totalPreferentialAmount));
-            //鍑忓厤閲戦(灏忚)
-            reportFeeMonthStatisticsTotalDto.setTotalDeductionAmount(String.format("%.2f", totalDeductionAmount));
-            //婊炵撼閲�(灏忚)
-            reportFeeMonthStatisticsTotalDto.setTotalLateFee(String.format("%.2f", totalLateFee));
-            //绌虹疆鎴挎墦鎶�(灏忚)
-            reportFeeMonthStatisticsTotalDto.setTotalVacantHousingDiscount(String.format("%.2f", totalVacantHousingDiscount));
-            //绌虹疆鎴垮噺鍏�(灏忚)
-            reportFeeMonthStatisticsTotalDto.setTotalVacantHousingReduction(String.format("%.2f", totalVacantHousingReduction));
-            //璧犻�佽鍒欓噾棰�(灏忚)
-            reportFeeMonthStatisticsTotalDto.setTotalGiftAmount(String.format("%.2f", totalGiftAmount));
-            //搴旀敹閲戦(澶ц)
-            reportFeeMonthStatisticsTotalDto.setAllReceivableAmount(String.format("%.2f", allReceivableAmount));
-            //瀹炴敹閲戦(澶ц)
-            reportFeeMonthStatisticsTotalDto.setAllReceivedAmount(String.format("%.2f", allReceivedAmount));
-            //浼樻儬閲戦(澶ц)
-            reportFeeMonthStatisticsTotalDto.setAllPreferentialAmount(String.format("%.2f", allPreferentialAmount));
-            //鍑忓厤閲戦(澶ц)
-            reportFeeMonthStatisticsTotalDto.setAllDeductionAmount(String.format("%.2f", allDeductionAmount));
-            //婊炵撼閲�(澶ц)
-            reportFeeMonthStatisticsTotalDto.setAllLateFee(String.format("%.2f", allLateFee));
-            //绌虹疆鎴挎墦鎶橀噾棰�(澶ц)
-            reportFeeMonthStatisticsTotalDto.setAllVacantHousingDiscount(String.format("%.2f", allVacantHousingDiscount));
-            //绌虹疆鎴垮噺鍏嶉噾棰�(澶ц)
-            reportFeeMonthStatisticsTotalDto.setAllVacantHousingReduction(String.format("%.2f", allVacantHousingReduction));
-            //璧犻�佽鍒欓噾棰�(澶ц)
-            reportFeeMonthStatisticsTotalDto.setAllGiftAmount(String.format("%.2f", allGiftAmount));
-        } else {
-            reportFeeMonthStatisticsDtos = new ArrayList<>();
-            reportList.addAll(reportFeeMonthStatisticsDtos);
-            reportFeeMonthStatisticsTotalDto = new ReportFeeMonthStatisticsTotalDto();
-        }
-
-        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reportFeeMonthStatisticsDto.getRow()), count, reportList, reportFeeMonthStatisticsTotalDto);
-
+        ResultVo resultVo = queryPayFeeDetailInnerServiceSMOImpl.query(reportFeeMonthStatisticsDto);
         ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
 
         return responseEntity;

--
Gitblit v1.8.0