暂存0829

chengf

2025-09-02 9faac602a31237bfc67b0b0748af1b31f5302482

 service-fee/src/main/java/com/java110/fee/cmd/fee/ReportFeeCmd.java

@@ -70,7 +70,7 @@
        reportQueryRecord.setOperator("白单流水汇总表");
        List<ReportQueryRecord> reportQueryRecords = reportFeeInnerServiceSMOImpl.queryReport(BeanConvertUtil.beanCovertMap(reportQueryRecord));

        if(reportQueryRecords.size()>0 && !reqJson.containsKey("reload")){
        if(reportQueryRecords.size()>0 && reqJson.containsKey("reload")){
            ResultVo resultVo = new ResultVo(JSONObject.parse(reportQueryRecords.get(reportQueryRecords.size()-1).getReportContent()));

            ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
@@ -163,8 +163,8 @@
        reportFeeDtoLists.add(col4);
        int ind = 1;

        int[] arr = new int[endYear - startYear + 1];
        for (int i = startYear; i <= endYear; i++) {
        int[] arr = new int[endYear - startYear + 1 - 2];
        for (int i = startYear; i <= endYear - 2; i++) {
            arr[i-startYear] = i;
        }
        List<Map> result = reportFeeInnerServiceSMOImpl.repostPaidInFee(feeQueryParams);
@@ -209,8 +209,8 @@
                                    col2Fee[i] = (doubles[i]+col2Fee[i])/2;
                                }
                            }else{
                                col1Fee[i] += doubleUse(doubles[i]);
                                col2Fee[i] += doubleUse(doubles[i]);
                                col1Fee[i] = doubleUse(doubles[i]+col1Fee[i]);
                                col2Fee[i] = doubleUse(doubles[i]+col1Fee[i]);
                            }
                        }
                    }
@@ -222,7 +222,7 @@
//                                    col2Fee[i] = (doubles[i]+col2Fee[i])/2;
                                }
                            }else{
                                col1Fee[i] += doubleUse(doubles[i]);
                                col1Fee[i] = doubleUse(doubles[i]+col1Fee[i]);
//                                col2Fee[i] += doubleUse(doubles[i]);
                            }
                        }
@@ -234,7 +234,7 @@
//                                    col2Fee[i] = (doubles[i]+col2Fee[i])/2;
                                }
                            }else{
                                col1Fee[i] += doubleUse(doubles[i]);
                                col1Fee[i] = doubleUse(doubles[i]+col1Fee[i]);
//                                col2Fee[i] += doubleUse(doubles[i]);
                            }
                        }