资料整编导出优化

aix

2024-07-15 6250972b924a8e45ad61fe4cd51d6db60a67013c

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

@@ -2,6 +2,7 @@

import cn.gistack.sm.sjztmd.entity.*;
import cn.gistack.sm.sjztmd.word.enums.*;
import cn.gistack.sm.sjztmd.word.util.WordUtil;
import com.alibaba.nacos.common.utils.StringUtils;
import lombok.Data;
import org.checkerframework.checker.formatter.qual.UnknownFormat;
@@ -498,29 +499,31 @@
      //水文特征
      List<String> hydrologicalCharacteristicsList = new ArrayList<>();

      List<String> hydrologicalCharacteristicsList2 = new ArrayList<>();

      if (tbAttResStagChar.getAdjustStorCap() != null) {
         hydrologicalCharacteristicsList.add(StringUtil.format("兴利库容{}万m³", tbAttResStagChar.getAdjustStorCap().toString()));
         hydrologicalCharacteristicsList.add(StringUtil.format("兴利库容{}万m³", WordUtil.removeTrailingZero(tbAttResStagChar.getAdjustStorCap().toString())));
      }
      if (tbAttResStagChar.getFlprCap() != null) {
         hydrologicalCharacteristicsList.add(StringUtil.format("调洪库容{}万m³", tbAttResStagChar.getFlprCap().toString()));
         hydrologicalCharacteristicsList.add(StringUtil.format("调洪库容{}万m³", WordUtil.removeTrailingZero(tbAttResStagChar.getFlprCap().toString())));
      }
      if (tbAttResStagChar.getDeadCap() != null) {
         hydrologicalCharacteristicsList.add(StringUtil.format("死库容{}万m³", tbAttResStagChar.getDeadCap().toString()));
         hydrologicalCharacteristicsList.add(StringUtil.format("死库容{}万m³", WordUtil.removeTrailingZero(tbAttResStagChar.getDeadCap().toString())));
      }
      if (tbAttResStagChar.getChecFlStag() != null) {
         hydrologicalCharacteristicsList.add(StringUtil.format("校核洪水位{}m", tbAttResStagChar.getChecFlStag().toString()));
         hydrologicalCharacteristicsList2.add(StringUtil.format(this.resName + "校核洪水位{}m", WordUtil.removeTrailingZero(tbAttResStagChar.getChecFlStag().toString())));
      }
      if (tbAttResStagChar.getDesFlStag() != null) {
         hydrologicalCharacteristicsList.add(StringUtil.format("设计洪水位{}m", tbAttResStagChar.getDesFlStag().toString()));
         hydrologicalCharacteristicsList2.add(StringUtil.format("设计洪水位{}m", WordUtil.removeTrailingZero(tbAttResStagChar.getDesFlStag().toString())));
      }
      if (tbAttResStagChar.getCorNormStag() != null) {
         hydrologicalCharacteristicsList.add(StringUtil.format("正常蓄水位{}m", tbAttResStagChar.getCorNormStag().toString()));
         hydrologicalCharacteristicsList2.add(StringUtil.format("正常蓄水位{}m", WordUtil.removeTrailingZero(tbAttResStagChar.getCorNormStag().toString())));
      }
      if (tbAttResStagChar.getDeadStag() != null) {
         hydrologicalCharacteristicsList.add(StringUtil.format("死水位{}m", tbAttResStagChar.getDeadStag().toString()));
         hydrologicalCharacteristicsList2.add(StringUtil.format("死水位{}m", WordUtil.removeTrailingZero(tbAttResStagChar.getDeadStag().toString())));
      }

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

   private void formatTbAttResWaterDelivery(List<TbAttResWaterDelivery> tbAttResWaterDeliveryList) {