暂存0822

chengf

2025-08-25 4fafe2304ab5e3df321808f5120b29baf27c7eab

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

@@ -67,6 +67,7 @@
        reportQueryRecord.setCommunityId(reqJson.getString("communityId"));
        reportQueryRecord.setQueryStatus("0");
        reportQueryRecord.setEndYear(currentYear+"");
        reportQueryRecord.setOperator("白单流水汇总表");
        List<ReportQueryRecord> reportQueryRecords = reportFeeInnerServiceSMOImpl.queryReport(BeanConvertUtil.beanCovertMap(reportQueryRecord));

        if(reportQueryRecords.size()>0 && !reqJson.containsKey("reload")){
@@ -99,6 +100,8 @@
            reportQueryRecord.setQueryStatus("0");
            reportQueryRecord.setEndYear(currentYear+"");
            reportQueryRecord.setReportContent(JSONObject.toJSONString(feeDto));
            reportQueryRecord.setOperator("白单流水汇总表");


            int i = reportFeeInnerServiceSMOImpl.saveReport(BeanConvertUtil.beanCovertMap(reportQueryRecord));

@@ -216,11 +219,11 @@
                            if(i == 3){
                                if (doubles[i] != 0){
                                    col1Fee[i] = (doubles[i]+col1Fee[i])/2;
                                    col2Fee[i] = (doubles[i]+col2Fee[i])/2;
//                                    col2Fee[i] = (doubles[i]+col2Fee[i])/2;
                                }
                            }else{
                                col1Fee[i] += doubleUse(doubles[i]);
                                col2Fee[i] += doubleUse(doubles[i]);
//                                col2Fee[i] += doubleUse(doubles[i]);
                            }
                        }
                    }else{
@@ -228,11 +231,11 @@
                            if(i == 3){
                                if (doubles[i] != 0){
                                    col1Fee[i] = (doubles[i]+col1Fee[i])/2;
                                    col2Fee[i] = (doubles[i]+col2Fee[i])/2;
//                                    col2Fee[i] = (doubles[i]+col2Fee[i])/2;
                                }
                            }else{
                                col1Fee[i] += doubleUse(doubles[i]);
                                col2Fee[i] += doubleUse(doubles[i]);
//                                col2Fee[i] += doubleUse(doubles[i]);
                            }
                        }
                    }