更新

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/EquipmentDto.java

 package com.yeejoin.amos.boot.module.ugp.api.dto;
 
+import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Equipment;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -7,6 +8,7 @@ import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 设备信息表
@@ -61,4 +63,10 @@ public class EquipmentDto  extends BaseDto {
 
     private String companyName;
 
+    /**
+     * 附件
+     */
+    private List<JSONObject> files;
+
+
 }

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/EquipmentServiceImpl.java

@@ -300,6 +300,10 @@ public class EquipmentServiceImpl extends BaseService<EquipmentDto, Equipment, E
         } else {
             result = equipmentMapper.allBoundWelder(page, projectId, companySequenceNbr, name);
         }
+        result.getRecords().forEach(item -> {
+            List<JSONObject> files = attachmentServiceImpl.getFilesBySourceId(item.getSequenceNbr());
+            item.setFiles(files);
+        });
         return result;
     }
 }
\ No newline at end of file

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/WelderServiceImpl.java

@@ -240,6 +240,11 @@ public class WelderServiceImpl {
             map.put("sequenceNbr", item.getSequenceNbr());
             List<Map<String, Object>> message = alertFormValueServiceImpl.getMessageMapByInstanceId(String.valueOf(item.getSequenceNbr()));
             message.forEach(dataItem -> {
+                if (String.valueOf(dataItem.get("column")).equals("image") && !ObjectUtils.isEmpty(dataItem.get("column")) && !ObjectUtils.isEmpty(dataItem.get("value"))) {
+                    String value1 = String.valueOf(dataItem.get("value"));
+                    List<Map<String, Object>> imageMap = (List<Map<String, Object>>) JSON.parse(value1);
+                    map.put("files", imageMap);
+                }
                 map.put(String.valueOf(dataItem.get("column")), dataItem.get("value"));
             });
             maps.add(map);