资料整编

aix

2024-08-15 a80ae0ce5bd06a42ece41e6a448b00991a0076e8

资料整编

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

@@ -530,7 +530,7 @@
            hydrologicalCharacteristicsList.add(StringUtil.format("死库容{}万m³", WordUtil.removeTrailingZero(tbAttResStagChar.getDeadCap().toString())));
        }
        if (tbAttResStagChar.getChecFlStag() != null) {
            hydrologicalCharacteristicsList2.add(StringUtil.format("校核洪水位{}m", String.format("%.2f",tbAttResStagChar.getChecFlStag())));
            hydrologicalCharacteristicsList2.add(StringUtil.format("水库校核洪水位{}m", String.format("%.2f",tbAttResStagChar.getChecFlStag())));
        }
        if (tbAttResStagChar.getDesFlStag() != null) {
            hydrologicalCharacteristicsList2.add(StringUtil.format("设计洪水位{}m", String.format("%.2f",tbAttResStagChar.getDesFlStag())));
@@ -679,10 +679,10 @@
        //（若一类坝，不介绍问题，二、三类坝介绍）
        if (tbAttResSafetyMonitor.getSafetyAppraisalResult().equals("1")) {
            this.safetyMonitorText = StringUtil.format("{}，水库进行安全鉴定，鉴定结果为“{}”。",
                time, type);
                time, type).replaceAll("。。","。");
        } else {
            this.safetyMonitorText = StringUtil.format("{}，水库进行安全鉴定，鉴定结果为“{}”，工程主要存在问题为{}。",
                time, type, surveyProblem);
                time, type, surveyProblem).replaceAll("。。","。");
        }
    }


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

Binary files differ