暂存0822

chengf

2025-08-22 5bfe05fa33b82fb055806125c7bacaac688241f8

暂存0822

 java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java

@@ -186,7 +186,15 @@

    private String targetEndTime;

    private BigDecimal[] report;
    private double[] report;

    public double[] getReport() {
        return report;
    }

    public void setReport(double[] report) {
        this.report = report;
    }

    private int[] yearArr;

@@ -245,13 +253,6 @@
        this.secondaryFeeTypeCdName = secondaryFeeTypeCdName;
    }

    public BigDecimal[] getReport() {
        return report;
    }

    public void setReport(BigDecimal[] report) {
        this.report = report;
    }

    public String getCommunityId() {
        return communityId;

 java110-db/src/main/resources/mapper/fee/ReportFeeServiceDaoImplMapper.xml

@@ -6,53 +6,35 @@
        SELECT
            fee_type_cd AS 'fee_type_cd',
            detail_year,
            -- 当年应收款项合计（保留2位小数）
            ROUND(SUM(CASE WHEN detail_year BETWEEN 2020 AND 2025 THEN receivable_amount ELSE 0 END), 2) AS '该年应缴总额',

            -- 当年收缴率（保留2位小数，百分比格式）
        ROUND(SUM(CASE WHEN detail_year BETWEEN ${startYear} AND ${endYear} THEN receivable_amount ELSE 0 END), 2) AS '该年应缴总额',
            ROUND(
                    CASE
                        WHEN SUM(CASE WHEN detail_year BETWEEN 2020 AND 2025 THEN receivable_amount ELSE 0 END) = 0 THEN 0
                        ELSE SUM(CASE WHEN detail_year BETWEEN 2020 AND 2025 THEN received_amount ELSE 0 END)
                                 / SUM(CASE WHEN detail_year BETWEEN 2020 AND 2025 THEN receivable_amount ELSE 0 END) * 100
        WHEN SUM(CASE WHEN detail_year BETWEEN ${startYear} AND ${endYear} THEN receivable_amount ELSE 0 END) = 0 THEN 0
        ELSE SUM(CASE WHEN detail_year BETWEEN ${startYear} AND ${endYear} THEN received_amount ELSE 0 END)
        / SUM(CASE WHEN detail_year BETWEEN ${startYear} AND ${endYear} THEN receivable_amount ELSE 0 END) * 100
                        END, 2
            ) AS '当年收缴率',

            -- 总折扣金额（保留2位小数）
            ROUND(SUM(CASE WHEN detail_year BETWEEN 2020 AND 2025 THEN discount_amount ELSE 0 END), 2) AS '折扣金额',
        ROUND(SUM(CASE WHEN detail_year BETWEEN ${startYear} AND ${endYear} THEN discount_amount ELSE 0 END), 2) AS '折扣金额',

            -- 2020-2024年实收金额（保留2位小数）
            ROUND(SUM(CASE WHEN detail_year = 2020 THEN received_amount ELSE 0 END), 2) AS '2020年实缴',
            ROUND(SUM(CASE WHEN detail_year = 2021 THEN received_amount ELSE 0 END), 2) AS '2021年实缴',
            ROUND(SUM(CASE WHEN detail_year = 2022 THEN received_amount ELSE 0 END), 2) AS '2022年实缴',
            ROUND(SUM(CASE WHEN detail_year = 2023 THEN received_amount ELSE 0 END), 2) AS '2023年实缴',
            ROUND(SUM(CASE WHEN detail_year = 2024 THEN received_amount ELSE 0 END), 2) AS '2024年实缴',
        <foreach collection="yearList" item="year" separator=",">
            <if test="year != endYear">  <!-- 排除最后一年，最后一年单独处理为“当年实缴” -->
                ROUND(SUM(CASE WHEN detail_year = ${year} THEN received_amount ELSE 0 END), 2) AS '${year}年实缴'
            </if>
        </foreach>,

            -- 2025年合计数据（保留2位小数）
            ROUND(SUM(CASE WHEN detail_year = 2025 THEN receivable_amount ELSE 0 END), 2) AS '当年预算',
            ROUND(SUM(CASE WHEN detail_year = 2025 THEN received_amount ELSE 0 END), 2) AS '2025年实缴',
            ROUND(SUM(CASE WHEN detail_year = 2025 THEN discount_amount ELSE 0 END), 2) AS '当年折扣总额',
            ROUND(SUM(CASE WHEN detail_year = 2025 THEN receivable_amount - received_amount ELSE 0 END), 2) AS '当年欠款',
        ROUND(SUM(CASE WHEN detail_year = ${endYear} THEN receivable_amount ELSE 0 END), 2) AS '当年预算',
        ROUND(SUM(CASE WHEN detail_year = ${endYear} THEN received_amount ELSE 0 END), 2) AS '${endYear}年实缴',
        ROUND(SUM(CASE WHEN detail_year = ${endYear} THEN discount_amount ELSE 0 END), 2) AS '当年折扣总额',
        ROUND(SUM(CASE WHEN detail_year = ${endYear} THEN receivable_amount - received_amount ELSE 0 END), 2) AS '当年欠款',

            -- 2025年各月份实收（保留2位小数）
            ROUND(SUM(CASE WHEN detail_year = 2025 AND detail_month = 1 THEN received_amount ELSE 0 END), 2) AS '当年1月实缴',
            ROUND(SUM(CASE WHEN detail_year = 2025 AND detail_month = 2 THEN received_amount ELSE 0 END), 2) AS '当年2月实缴',
            ROUND(SUM(CASE WHEN detail_year = 2025 AND detail_month = 3 THEN received_amount ELSE 0 END), 2) AS '当年3月实缴',
            ROUND(SUM(CASE WHEN detail_year = 2025 AND detail_month = 4 THEN received_amount ELSE 0 END), 2) AS '当年4月实缴',
            ROUND(SUM(CASE WHEN detail_year = 2025 AND detail_month = 5 THEN received_amount ELSE 0 END), 2) AS '当年5月实缴',
            ROUND(SUM(CASE WHEN detail_year = 2025 AND detail_month = 6 THEN received_amount ELSE 0 END), 2) AS '当年6月实缴',
            ROUND(SUM(CASE WHEN detail_year = 2025 AND detail_month = 7 THEN received_amount ELSE 0 END), 2) AS '当年7月实缴',
            ROUND(SUM(CASE WHEN detail_year = 2025 AND detail_month = 8 THEN received_amount ELSE 0 END), 2) AS '当年8月实缴',
            ROUND(SUM(CASE WHEN detail_year = 2025 AND detail_month = 9 THEN received_amount ELSE 0 END), 2) AS '当年9月实缴',
            ROUND(SUM(CASE WHEN detail_year = 2025 AND detail_month = 10 THEN received_amount ELSE 0 END), 2) AS '当年10月实缴',
            ROUND(SUM(CASE WHEN detail_year = 2025 AND detail_month = 11 THEN received_amount ELSE 0 END), 2) AS '当年11月实缴',
            ROUND(SUM(CASE WHEN detail_year = 2025 AND detail_month = 12 THEN received_amount ELSE 0 END), 2) AS '当年12月实缴',
        <foreach collection="monthList" item="month" separator=",">
            ROUND(SUM(CASE WHEN detail_year = ${endYear} AND detail_month = ${month} THEN received_amount ELSE 0 END), 2) AS '当年${month}月实缴'
        </foreach>,

            -- 每月费用（保留2位小数）和应收月份数（整数，无需处理）
            ROUND(AVG(CASE WHEN detail_year BETWEEN 2020 AND 2025 THEN receivable_amount ELSE NULL END), 2) AS '每月费用',
            COUNT(DISTINCT CASE WHEN detail_year BETWEEN 2020 AND 2025 THEN CONCAT(detail_year, '-', detail_month) END) AS '应收月份数',
        ROUND(AVG(CASE WHEN detail_year BETWEEN ${startYear} AND ${endYear} THEN receivable_amount ELSE NULL END), 2) AS '每月费用',
        COUNT(DISTINCT CASE WHEN detail_year BETWEEN ${startYear} AND ${endYear} THEN CONCAT(detail_year, '-', detail_month) END) AS '应收月份数',

            -- 费用所属年份（区分普通行和汇总行）
            CASE
                WHEN detail_year IS NULL THEN '类型总计'
                ELSE CAST(detail_year AS CHAR)
@@ -62,7 +44,7 @@
            pay_fee_detail_month
        WHERE
            community_id = #{communityId}
            detail_year BETWEEN 2020 AND 2025
        AND detail_year BETWEEN ${startYear} AND ${endYear}  <!-- 动态年份过滤 -->
        GROUP BY
            fee_type_cd, detail_year
        WITH ROLLUP;

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

@@ -127,13 +127,13 @@
        int doYear = endYear - startYear;
        LinkedList<FeeDto> col1 = new LinkedList<>();
        FeeDto col = new FeeDto();
        BigDecimal[] col1Fee = new BigDecimal[doYear - 1 + 20];
        double[] col1Fee = new double[doYear - 1 + 20];
        col.setReport(col1Fee);
        col.setCurYear("收入合计（白单流水）");
        col1.add(col);

        LinkedList<FeeDto> col2 = new LinkedList<>();
        BigDecimal[] col2Fee = new BigDecimal[doYear - 1 + 20];
        double[] col2Fee = new double[doYear - 1 + 20];
        col = new FeeDto();
        col.setReport(col2Fee);
        col.setCurYear("物业费+代收合计");
@@ -147,13 +147,13 @@

        LinkedList<FeeDto> col4 = new LinkedList<>();
        col = new FeeDto();
        col.setReport(new BigDecimal[doYear - 1 + 20]);
        col.setReport(new double[doYear - 1 + 20]);
        col.setCurYear("物业费代收合计");
        col3.add(col);

        BigDecimal[] col4Fee = new BigDecimal[doYear - 1 + 20];
        BigDecimal[] colByCar = new BigDecimal[doYear - 1 + 20];
        BigDecimal[] colByOther = new BigDecimal[doYear - 1 + 20];
        double[] col4Fee = new double[doYear - 1 + 20];
        double[] colByCar = new double[doYear - 1 + 20];
        double[] colByOther = new double[doYear - 1 + 20];
        reportFeeDtoLists.add(col1);
        reportFeeDtoLists.add(col2);
        reportFeeDtoLists.add(col2);
@@ -175,64 +175,64 @@
            LinkedList<FeeDto> feeDtos = new LinkedList<>();//总的
            int kg = 0;
            for (Map map : result){
                if(map.get("费用所属年份").equals("类型总计") && map.get("fee_type_cd").equals(dictDto1.getStatusCd())){
                    BigDecimal[] doubles = new BigDecimal[doYear - 1 + 20];
                    doubles[0] = (BigDecimal) map.get("该年应缴总额");
                    doubles[1] = (BigDecimal) map.get("每月费用");
                    doubles[2] = (BigDecimal) map.get("应收月份数");
                    doubles[3] = (BigDecimal) map.get("当年收缴率");
                    doubles[4] = (BigDecimal) map.get("折扣金额");
                if(map.get("费用所属年份").equals("类型总计") && map.containsKey("fee_type_cd") && map.get("fee_type_cd").equals(dictDto1.getStatusCd())){
                    double[] doubles = new double[doYear - 1 + 20];
                    doubles[0] = doubleUse(((BigDecimal) map.get("该年应缴总额")).doubleValue());
                    doubles[1] = doubleUse(((BigDecimal) map.get("每月费用")).doubleValue());
                    doubles[2] = doubleUse(((Long) map.get("应收月份数")).doubleValue());
                    doubles[3] = doubleUse(((BigDecimal) map.get("当年收缴率")).doubleValue());
                    doubles[4] = doubleUse(((BigDecimal) map.get("折扣金额")).doubleValue());
                    int inde = 0;
                    for (int i : arr){
                        if(i < currentYear){
                            inde++;
                            doubles[i - startYear + 5] = (BigDecimal) map.get(i + "年实缴");
                            doubles[i - startYear + 5] = doubleUse(((BigDecimal) map.get(i + "年实缴")).doubleValue());
                        }
                    }
                    doubles[inde + 5] =(BigDecimal) map.get("当年预算");
                    doubles[inde + 6] =(BigDecimal) map.get(currentYear + "年实缴");
                    doubles[inde + 7] =(BigDecimal) map.get("当年折扣总额");
                    doubles[inde + 8] =(BigDecimal) map.get("当年欠款");
                    doubles[inde + 5] =doubleUse(((BigDecimal) map.get("当年预算")).doubleValue());
                    doubles[inde + 6] =doubleUse(((BigDecimal) map.get(currentYear + "年实缴")).doubleValue());
                    doubles[inde + 7] =doubleUse(((BigDecimal) map.get("当年折扣总额")).doubleValue());
                    doubles[inde + 8] =doubleUse(((BigDecimal) map.get("当年欠款")).doubleValue());

                    for (int i = 1 ; i <= 12 ; i++){
                        doubles[inde + 8 + i] =(BigDecimal) map.get("当年"+(i < 10 ? "0"+i : i) +"月实缴");
                        doubles[inde + 8 + i] =doubleUse(((BigDecimal) map.get("当年"+(i < 10 ? "0"+i : i) +"月实缴")).doubleValue());
                    }
                    feeDto.setCurYear(dictDto1.getName()+"总计");
                    if(Integer.parseInt(dictDto1.getStatusCd())%630000000 < 3){
                        for(int i = 0 ; i < doubles.length ; i++){
                            if(i == 3){
                                if (doubles[i].intValue() != 0){
                                    col1Fee[i] = BigDecimal.valueOf((doubles[i].add(col1Fee[i])).doubleValue()/2);
                                    col2Fee[i] = BigDecimal.valueOf((doubles[i].add(col1Fee[i])).doubleValue()/2);
                                if (doubles[i] != 0){
                                    col1Fee[i] = (doubles[i]+col1Fee[i])/2;
                                    col2Fee[i] = (doubles[i]+col2Fee[i])/2;
                                }
                            }else{
                                col1Fee[i].add(doubleUse(doubles[i]));
                                col2Fee[i].add(doubleUse(doubles[i]));
                                col1Fee[i] += doubleUse(doubles[i]);
                                col2Fee[i] += doubleUse(doubles[i]);
                            }
                        }
                    }
                    else if(Integer.parseInt(dictDto1.getStatusCd())%630000000 < 8){
                        for(int i = 0 ; i < doubles.length ; i++){
                            if(i == 3){
                                if (doubles[i].intValue() != 0){
                                    col1Fee[i] = BigDecimal.valueOf((doubles[i].add(col1Fee[i])).doubleValue()/2);
                                    col2Fee[i] = BigDecimal.valueOf((doubles[i].add(col1Fee[i])).doubleValue()/2);
                                if (doubles[i] != 0){
                                    col1Fee[i] = (doubles[i]+col1Fee[i])/2;
                                    col2Fee[i] = (doubles[i]+col2Fee[i])/2;
                                }
                            }else{
                                col1Fee[i].add(doubleUse(doubles[i]));
                                col2Fee[i].add(doubleUse(doubles[i]));
                                col1Fee[i] += doubleUse(doubles[i]);
                                col2Fee[i] += doubleUse(doubles[i]);
                            }
                        }
                    }else{
                        for(int i = 0 ; i < doubles.length ; i++){
                            if(i == 3){
                                if (doubles[i].intValue() != 0){
                                    col1Fee[i] = BigDecimal.valueOf((doubles[i].add(col1Fee[i])).doubleValue()/2);
                                    col2Fee[i] = BigDecimal.valueOf((doubles[i].add(col1Fee[i])).doubleValue()/2);
                                if (doubles[i] != 0){
                                    col1Fee[i] = (doubles[i]+col1Fee[i])/2;
                                    col2Fee[i] = (doubles[i]+col2Fee[i])/2;
                                }
                            }else{
                                col1Fee[i].add(doubleUse(doubles[i]));
                                col2Fee[i].add(doubleUse(doubles[i]));
                                col1Fee[i] += doubleUse(doubles[i]);
                                col2Fee[i] += doubleUse(doubles[i]);
                            }
                        }
                    }
@@ -245,7 +245,7 @@
                feeDto.setCurYear("类型总计");
            }
            if (feeDto.getReport() == null){
                feeDto.setReport(new BigDecimal[doYear - 1 + 20]);
                feeDto.setReport(new double[doYear - 1 + 20]);
            }
            if(feeDto.getFeeTypeCdName() == null) {
                feeDto.setFeeTypeCdName(dictDto1.getName());
@@ -260,26 +260,26 @@
                kg = 0;
                for (Map map : result){
                    if(map.get("费用所属年份").equals(i+"") && map.get("fee_type_cd").equals(dictDto1.getStatusCd())){
                        BigDecimal[] doubles = new BigDecimal[doYear - 1 + 20];
                        doubles[0] = (BigDecimal) map.get("该年应缴总额");
                        doubles[1] = (BigDecimal) map.get("每月费用");
                        doubles[2] = (BigDecimal) map.get("应收月份数");
                        doubles[3] = (BigDecimal) map.get("当年收缴率");
                        doubles[4] = (BigDecimal) map.get("折扣金额");
                        double[] doubles = new double[doYear - 1 + 20];
                        doubles[0] = doubleUse(((BigDecimal) map.get("该年应缴总额")).doubleValue());
                        doubles[1] = doubleUse(((BigDecimal) map.get("每月费用")).doubleValue());
                        doubles[2] = doubleUse(((Long) map.get("应收月份数")).doubleValue());
                        doubles[3] = doubleUse(((BigDecimal) map.get("当年收缴率")).doubleValue());
                        doubles[4] = doubleUse(((BigDecimal) map.get("折扣金额")).doubleValue());
                        int inde = 0;
                        for (int in : arr){
                            if(in < currentYear){
                                inde++;
                                doubles[in - startYear + 5] = (BigDecimal) map.get(i + "年实缴");
                                doubles[in - startYear + 5] = doubleUse(((BigDecimal) map.get(i + "年实缴")).doubleValue());
                            }
                        }
                        doubles[inde + 5] =(BigDecimal) map.get("当年预算");
                        doubles[inde + 6] =(BigDecimal) map.get(currentYear + "年实缴");
                        doubles[inde + 7] =(BigDecimal) map.get("当年折扣总额");
                        doubles[inde + 8] =(BigDecimal) map.get("当年欠款");
                        doubles[inde + 5] =doubleUse(((BigDecimal) map.get("当年预算")).doubleValue());
                        doubles[inde + 6] =doubleUse(((BigDecimal) map.get(currentYear + "年实缴")).doubleValue());
                        doubles[inde + 7] =doubleUse(((BigDecimal) map.get("当年折扣总额")).doubleValue());
                        doubles[inde + 8] =doubleUse(((BigDecimal) map.get("当年欠款")).doubleValue());

                        for (int in = 1 ; in <= 12 ; in++){
                            doubles[inde + 8 + in] =(BigDecimal) map.get("当年"+(in < 10 ? "0"+in : in) +"月实缴");
                            doubles[inde + 8 + in] =doubleUse(((BigDecimal) map.get("当年"+(in < 10 ? "0"+in : in) +"月实缴")).doubleValue());
                        }
                        feeDto = new FeeDto();
                        feeDto.setFeeTypeCdName(dictDto1.getName());
@@ -294,7 +294,7 @@
                    feeDto = new FeeDto();
                    feeDto.setFeeTypeCdName(dictDto1.getName());
                    feeDto.setCurYear(String.valueOf(i));
                    feeDto.setReport(new BigDecimal[doYear - 1 + 20]);
                    feeDto.setReport(new double[doYear - 1 + 20]);
                    feeDto.setCount(ind);
                    feeDtos2.add(feeDto);
                }
@@ -333,7 +333,7 @@
            ind ++;
        }
    }
    public BigDecimal doubleUse(BigDecimal num){
        return  num;
    public double doubleUse(double num){
        return  (int)(num * 100) / 100.0;
    }
}