1、修改pc端导出word多个危险标识报错问题

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/dto/RiskNotificationExportWordDto.java

@@ -3,6 +3,9 @@ package com.censoft.censoftrongtong.domain.dto;
 import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
+import java.util.HashMap;
+import java.util.List;
+
 /**
  * @author 周昊
  * @desc ...
@@ -41,6 +44,11 @@ public class RiskNotificationExportWordDto {
      */
     private String safetyWarningSigns;
 
+    /**
+     * 安全警示标志list
+     */
+    private List<HashMap<String,String>> safetyWarningSignsList;
+
     /**
      * 应采取的管理措施
      */

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/RiskPlanInherentListServiceImpl.java

@@ -30,10 +30,7 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -239,7 +236,15 @@ public class RiskPlanInherentListServiceImpl
     public RiskNotificationExportWordDto getRiskNotificationExportWordDto(Long inherentId) {
         RiskNotificationExportWordDto dto = riskPlanInherentListMapper.getRiskNotificationExportWordDto(inherentId);
         if (StrUtil.isNotBlank(dto.getSafetyWarningSigns())){
-            dto.setSafetyWarningSigns(WordUtil.getImageStr("D:\\ruoyi\\uploadPath\\upload\\警告标志\\"+dto.getSafetyWarningSigns()+".png"));
+            List<HashMap<String, String>> safetyWarningSignsList = Arrays.stream(dto.getSafetyWarningSigns().split(","))
+                    .map(sign ->{
+                        HashMap<String, String> map = new HashMap<>();
+                        map.put("url",WordUtil.getImageStr("D:\\ruoyi\\uploadPath\\upload\\警告标志\\" + sign + ".png"));
+                        return map;
+                    }).collect(Collectors.toList());
+            dto.setSafetyWarningSignsList(safetyWarningSignsList);
+        }else {
+            dto.setSafetyWarningSignsList(new ArrayList<>());
         }
         return dto;
     }