资料整编导出优化

aix

2024-07-19 4e49829dceeecec374f06f2da535979248e1c94d

资料整编导出优化

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/enums/AqueductTypeEnum.java

@@ -33,7 +33,7 @@

    GUAN_DAO("1","管道"),

    SUI_DONG("2","隧道"),
    SUI_DONG("2","隧洞"),

    DI_MIAN_QU_DAO("3","地面渠道"),


 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/TbWordVO.java

@@ -243,7 +243,8 @@
        //输水建筑物
        if (tbAttResWaterDeliveryList.size()>0&&tbAttResWaterDeliveryList.get(0).getNum()  != null &&  tbAttResWaterDeliveryList.get(0).getNum() > 0) {
            tbAttResWaterDeliveryList.forEach(tbAttResWaterDelivery -> {
                buildingList.add( convertType(tbAttResWaterDelivery.getAqueductType(),"AqueductTypeEnum"));
//                buildingList.add( convertType(tbAttResWaterDelivery.getAqueductType(),"AqueductTypeEnum"));
                buildingList.add("输水建筑物");
            });
        }

@@ -281,7 +282,7 @@
        String hour = String.valueOf(stationPower.getYearAvgHour());

        text = StringUtil.format("水电站为{}，装机容量{}kW，年均利用小时{}h。",
            type,capacity,hour);
            type,WordUtil.removeTrailingZero(capacity),WordUtil.removeTrailingZero(hour));

        return text;
    }
@@ -326,7 +327,7 @@
        String disCharge = isNull(norspi.getCheckingFloodDischarge());

        String text = StringUtil.format("溢洪道为{}，{}，堰顶高程{}m，堰顶净宽{}m{}，最大泄洪量{}m³/s。",
            typeName, gateText, StringUtil.format("设计洪水位{}m", String.format("%.2f",norspi.getWeirTopElevation())), weirTopWidth, holeText, disCharge);
            typeName, gateText, StringUtil.format("", String.format("%.2f",norspi.getWeirTopElevation())), WordUtil.removeTrailingZero(weirTopWidth), holeText, WordUtil.removeTrailingZero(disCharge));

        return text;
    }
@@ -382,7 +383,7 @@


        String info = StringUtil.format("{}为{}，坝顶高程{}m，最大坝高{}m，坝长{}m，坝顶宽{}m。",
            name, mainDamType, Double.parseDouble(String.format("%.2f",tbAttResWaterBlock.getDamTopElevation())), mainDamHeight, mainDamTopLength, mainDamWidth);
            name, mainDamType, String.format("%.2f",tbAttResWaterBlock.getDamTopElevation()), mainDamHeight, WordUtil.removeTrailingZero(mainDamTopLength), WordUtil.removeTrailingZero(mainDamWidth));

        return info;
    }
@@ -529,7 +530,7 @@
            hydrologicalCharacteristicsList2.add(StringUtil.format("死水位{}m", String.format("%.2f",tbAttResStagChar.getDeadStag())));
        }

        this.hydrologicalCharacteristics = String.join("，", hydrologicalCharacteristicsList) + "；" + String.join("，", hydrologicalCharacteristicsList2);
        this.hydrologicalCharacteristics = String.join("，", hydrologicalCharacteristicsList) + "。" + String.join("，", hydrologicalCharacteristicsList2);
    }

    private void formatTbAttResWaterDelivery(List<TbAttResWaterDelivery> tbAttResWaterDeliveryList) {
@@ -540,19 +541,20 @@

        TbAttResWaterDelivery tbAttResWaterDelivery = tbAttResWaterDeliveryList.get(0);
        if (tbAttResWaterDeliveryList.size() > 1) {
            this.aqueductType = "水库主要采用";
            this.aqueductType = "水库主要采用输水";
        } else {
            this.aqueductType = "水库采用";
            this.aqueductType = "水库采用输水";
        }


        this.aqueductType = this.aqueductType + convertType(tbAttResWaterDelivery.getAqueductType(),"AqueductTypeEnum");

        this.section = isNull(tbAttResWaterDelivery.getSectionWide()) + "X" + isNull(tbAttResWaterDelivery.getSectionHigh());
        this.section = isNull(tbAttResWaterDelivery.getSectionWide()) + "×" + isNull(tbAttResWaterDelivery.getSectionHigh());

        this.thresholdElevation = isNull(tbAttResWaterDelivery.getThresholdElevation());
        this.thresholdElevation = String.format("%.2f",tbAttResWaterDelivery.getThresholdElevation());

        this.designFlow = isNull(tbAttResWaterDelivery.getDesignFlow());

        this.designFlow = WordUtil.removeTrailingZero(isNull(tbAttResWaterDelivery.getDesignFlow()));

    }


 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/resources/word/doc/skcgmb.docx

Binary files differ