资料整编

aix

2024-08-12 5780352fba5bcdc02b428128d9bf4536fa70addb

资料整编

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/service/impl/SjztmdServiceImpl.java

@@ -342,15 +342,19 @@
        if (tbAttResRsbNorspiList != null && tbAttResRsbNorspiList.size() > 0 && tbAttResRsbNorspiList.get(0).getNum() != null && tbAttResRsbNorspiList.get(0).getNum() > 0) {
            TbAttResRsbNorspi tbAttResRsbNorspi = tbAttResRsbNorspiList.get(0);

            norSpillwayType = SpillwayTypeEnum.find(tbAttResRsbNorspi.getSpillwayType()).getLabel();
            if (tbAttResRsbNorspi.getSpillwayType().indexOf("9") > -1) {
                norSpillwayType = tbAttResRsbNorspi.getSpillwayType().split(",")[1];
            } else {
                norSpillwayType = SpillwayTypeEnum.find(tbAttResRsbNorspi.getSpillwayType()).getLabel();
            }

            isLocDamBody = tbAttResRsbNorspi.getIsLocDamBody();
            norWeirTopElevation = isNullObject(tbAttResRsbNorspi.getWeirTopElevation());
            norWeirTopWidth = isNullObject(tbAttResRsbNorspi.getWeirTopWidth());

            if (tbAttResRsbNorspi.getIsGate() == "否") {
            if (tbAttResRsbNorspi.getIsGate().equals("否")) {
                norWorkingGateType = "无闸控制";
            } else if (tbAttResRsbNorspi.getIsGate() == "是") {
            } else if (tbAttResRsbNorspi.getIsGate().equals("是")) {
                // 平板闸门，3X3
                String typeName = RsbWorkingGateEnum.find(tbAttResRsbNorspi.getWorkingGateType().toString()).getLabel();
                String norwgtStr = "";
@@ -432,7 +436,7 @@
        String rsbWorkingGateType = "";
        String rsbOc = "";

        if (tbAttResRsbSpillwayList != null && tbAttResRsbSpillwayList.size() > 0 && tbAttResRsbSpillwayList.get(0).getNum() > 0) {
        if (tbAttResRsbSpillwayList != null && tbAttResRsbSpillwayList.size() > 0) {
            TbAttResRsbSpillway tbAttResRsbSpillway = tbAttResRsbSpillwayList.get(0);

            //类型为其他，有补充说明
@@ -442,8 +446,9 @@
            coveLength = isNullObject(tbAttResRsbSpillway.getCoveLength());
            rsbThresholdElevation = isNullObject(tbAttResRsbSpillway.getThresholdElevation());
            rsbExportElevation = isNullObject(tbAttResRsbSpillway.getExportElevation());
            rsbSection = StringUtil.format("{}×{}", tbAttResRsbSpillway.getSectionWide(), tbAttResRsbSpillway.getSectionLength());
            ;
            if (null != tbAttResRsbSpillway.getSectionWide() && null != tbAttResRsbSpillway.getSectionLength())
                rsbSection = StringUtil.format("{}×{}", tbAttResRsbSpillway.getSectionWide(), tbAttResRsbSpillway.getSectionLength());

            checkFlDisCharge = isNullObject(tbAttResRsbSpillway.getCheckFlDisCharge());


@@ -490,10 +495,10 @@
            else
                deliverSection = StringUtil.format("φ{}", tbAttResWaterDelivery.getSectionWide());
            designFlow = isNullObject(tbAttResWaterDelivery.getDesignFlow());
            workingGateType = tbAttResWaterDelivery.getWorkingGateType();
            workingGateType = convertType(tbAttResWaterDelivery.getWorkingGateType(), "RsbWorkingGateEnum");
            List<String> list = new ArrayList<>();
            list.add(tbAttResWaterDelivery.getOcType());
            list.add(tbAttResWaterDelivery.getOcPower());
            list.add(convertType(tbAttResWaterDelivery.getOcType(), "SpillwayHoleType"));
            list.add(convertType(tbAttResWaterDelivery.getOcPower(), "SpillwayHoleType"));
            deliverOc = String.join(",", list);

            if (i == 0) {
@@ -563,7 +568,7 @@

        //水电站
        String plantLayoutType = "";
        double installedCapacity = 0d;
        String installedCapacity = "";
        String yearAvgHour = "";
        //当电站列表不为空 且 电站列表数量大于0 且num大于0  -- 2024-07-18修改，展示多个
//        if (tbAttResPowerStationList != null && tbAttResPowerStationList.size() > 0 && tbAttResPowerStationList.get(0).getNum()!=null && tbAttResPowerStationList.get(0).getNum() > 0) {
@@ -583,7 +588,11 @@
                plantLayoutType = plantLayoutType + "、" + PlantLayoutTypeEnum.find(tbAttResPowerStation.getPlantLayoutType()).getLabel();
            }

            installedCapacity = installedCapacity + tbAttResPowerStation.getInstalledCapacity();
            if (StringUtil.isBlank(installedCapacity)) {
                installedCapacity = WordUtil.removeTrailingZero(isNullObject(tbAttResPowerStation.getInstalledCapacity()));
            } else {
                installedCapacity = installedCapacity + "+" + WordUtil.removeTrailingZero(isNullObject(tbAttResPowerStation.getInstalledCapacity()));
            }

            if (StringUtil.isBlank(yearAvgHour)) {
                yearAvgHour = WordUtil.removeTrailingZero(isNullObject(tbAttResPowerStation.getYearAvgHour()));
@@ -593,8 +602,8 @@
        }

        tableMap.put("plantLayoutType", plantLayoutType);
        tableMap.put("installedCapacity", WordUtil.removeTrailingZero(installedCapacity + ""));
        tableMap.put("yearAvgHour", yearAvgHour);
        tableMap.put("installedCapacity", !installedCapacity.equals("0")?installedCapacity:"");
        tableMap.put("yearAvgHour", !yearAvgHour.equals("0")?yearAvgHour:"");

        //水库效益
        List<String> protectList = new ArrayList<>();