skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/util/WordUtil.java
@@ -134,6 +134,7 @@ params.put("中型水库详情", overWord.getOverMidInfo()); params.put("省直水库详情", overWord.getProvinceInfo()); params.put("短信预警和外呼抽查", overWord.getSmsResultInfo()); params.put("重点水库详情", overWord.getZdInfo()); //不在汛期内 if (!MyDateUtils.isTodayInFloodSeason()) { params.put("全省水库超正常", overWord.getTotalOverNormalInfo()); skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/OverWord.java
@@ -45,6 +45,7 @@ private String overNormalMidInfo; private String smsResultInfo; private String zdInfo; public OverWord(List<TotalInfo> totalList, List<DzkInfo> dzkList, List<OverDetail> overDetailList, List<SzInfo> szInfoList, List<SmsResultVO> resultVOList, List<CallTaskResultVO> whtjList, String isNew) { this.tm = new SimpleDateFormat("MM月dd日H时").format(new Date()); @@ -234,14 +235,22 @@ private void formatSzInfo(List<SzInfo> szInfoList) { List<String> list = new ArrayList<>(); List<String> listZd = new ArrayList<>(); for (int i = 0; i < szInfoList.size(); i++) { SzInfo szInfo = szInfoList.get(i); if (szInfo.getType().equals("省直水库")) { String text = generateSzInfo(szInfo); list.add(text); } else { listZd.add(generateSzInfo(szInfo)); } } // this.provinceInfo = String.join("\n\r\r\r\r",list); this.provinceInfo = String.join("\n", list); this.zdInfo = String.join("\n", listZd); } private String generateSzInfo(SzInfo szInfo) { skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/SzInfo.java
@@ -28,4 +28,6 @@ private Double control_z;//控制水位 private Double wat_shed_area;//集雨面积 private String type; } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/resources/word/doc/overFloodTemplate.docxBinary files differ
