每日报汛增加堰顶

xieb

2024-07-08 86910cd63c9f188065999552cd49f7ac14464fbb

每日报汛增加堰顶

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

@@ -281,6 +281,7 @@
        String flse_lim_stag = "";
        String control_z = "";
        String wat_shed_area = "";
        String weir_top_elevation = "";

        if (null != szInfo.getFlse_lim_stag())
            flse_lim_stag = String.valueOf(szInfo.getFlse_lim_stag());
@@ -288,6 +289,8 @@
            control_z = String.valueOf(szInfo.getControl_z());
        if (null != szInfo.getWat_shed_area())
            wat_shed_area = String.valueOf(szInfo.getWat_shed_area());
        if (null != szInfo.getWeir_top_elevation())
            weir_top_elevation = String.valueOf(szInfo.getWeir_top_elevation());

        // 之前临时处理逻辑 --2024-06-20去除--
//        switch (resNm) {
@@ -319,6 +322,12 @@
//        }

        List<String> detailList = new ArrayList<>();
        if (StringUtil.isNotBlank(weir_top_elevation)) {
            detailList.add(StringUtil.format("堰顶高程{}米", weir_top_elevation));
        }
        if (StringUtil.isNotBlank(flse_lim_stag)) {
            detailList.add(StringUtil.format("汛限水位{}米", flse_lim_stag));
        }
        if (StringUtil.isNotBlank(flse_lim_stag)) {
            detailList.add(StringUtil.format("汛限水位{}米", flse_lim_stag));
        }
@@ -389,6 +398,9 @@
        if (ObjectUtil.isNotEmpty(dzkInfo.getTb_flse_lim_stag())) {
            detailList.add(StringUtil.format("汛限水位{}米", dzkInfo.getTb_flse_lim_stag()));
        }
        if (ObjectUtil.isNotEmpty(dzkInfo.getTb_weir_top_elevation())) {
            detailList.add(StringUtil.format("堰顶高程{}米", dzkInfo.getTb_weir_top_elevation()));
        }

        String detail = String.join("，", detailList);
        text = StringUtil.format("    {}{}{}（{}）。", dzkInfo.getP_ad_name(), dzkInfo.getAd_name(), dzkInfo.getRes_name(), detail);

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

@@ -27,6 +27,7 @@
    private Double flse_lim_stag;//汛限水位
    private Double control_z;//控制水位
    private Double wat_shed_area;//集雨面积
    private Double weir_top_elevation;//集雨面积

    private String type;