资料整编导出功能修改

aix

2024-07-16 9963f3dd18fed2182e123c3c891d0ba93a07d26d

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

@@ -320,7 +320,7 @@
      String disCharge = isNull(norspi.getCheckingFloodDischarge());

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

      return text;
   }
@@ -376,7 +376,7 @@


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

      return info;
   }
@@ -511,16 +511,16 @@
         hydrologicalCharacteristicsList.add(StringUtil.format("死库容{}万m³", WordUtil.removeTrailingZero(tbAttResStagChar.getDeadCap().toString())));
      }
      if (tbAttResStagChar.getChecFlStag() != null) {
         hydrologicalCharacteristicsList2.add(StringUtil.format(this.resName + "校核洪水位{}m", Double.parseDouble(String.format("%.2f",tbAttResStagChar.getChecFlStag()))));
         hydrologicalCharacteristicsList2.add(StringUtil.format(this.resName + "校核洪水位{}m", String.format("%.2f",tbAttResStagChar.getChecFlStag())));
      }
      if (tbAttResStagChar.getDesFlStag() != null) {
         hydrologicalCharacteristicsList2.add(StringUtil.format("设计洪水位{}m", Double.parseDouble(String.format("%.2f",tbAttResStagChar.getDesFlStag()))));
         hydrologicalCharacteristicsList2.add(StringUtil.format("设计洪水位{}m", String.format("%.2f",tbAttResStagChar.getDesFlStag())));
      }
      if (tbAttResStagChar.getCorNormStag() != null) {
         hydrologicalCharacteristicsList2.add(StringUtil.format("正常蓄水位{}m", Double.parseDouble(String.format("%.2f",tbAttResStagChar.getCorNormStag()))));
         hydrologicalCharacteristicsList2.add(StringUtil.format("正常蓄水位{}m", String.format("%.2f",tbAttResStagChar.getCorNormStag())));
      }
      if (tbAttResStagChar.getDeadStag() != null) {
         hydrologicalCharacteristicsList2.add(StringUtil.format("死水位{}m", Double.parseDouble(String.format("%.2f",tbAttResStagChar.getDeadStag()))));
         hydrologicalCharacteristicsList2.add(StringUtil.format("死水位{}m", String.format("%.2f",tbAttResStagChar.getDeadStag())));
      }

      this.hydrologicalCharacteristics = String.join("，", hydrologicalCharacteristicsList) + "；" + String.join("，", hydrologicalCharacteristicsList2);
@@ -534,9 +534,9 @@

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