修改整改单bug

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/AcceptanceRectificationOrderDto.java

@@ -10,6 +10,7 @@ import lombok.EqualsAndHashCode;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 验收整改单
@@ -62,7 +63,7 @@ public class AcceptanceRectificationOrderDto extends BaseDto {
     private String responsibleUserPhone;
 
     @ApiModelProperty(value = "整改照片")
-    private String rectificationPhoto;
+    private List<FileItemDto> rectificationPhoto;
 
     @ApiModelProperty(value = "电站编号")
     private String powerStationCode;
@@ -73,4 +74,5 @@ public class AcceptanceRectificationOrderDto extends BaseDto {
     @ApiModelProperty(value = "电站地址")
     private String powerStationAddress;
 
+    private String rectificationPhotoStr;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/FileItemDto.java

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import lombok.Data;
+
+/**
+ * @author keyong
+ * @title: FileItem
+ * <pre>
+ * @description: TODO
+ * </pre>
+ * @date 2024/1/5 17:33
+ */
+@Data
+public class FileItemDto {
+
+        private String uid;
+        private String name;
+        private String status;
+        private String url;
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/AcceptanceRectificationOrderMapper.xml

@@ -33,6 +33,7 @@
             resultType="com.yeejoin.amos.boot.module.hygf.api.dto.AcceptanceRectificationOrderDto">
         SELECT
             aro.*,
+            aro.rectification_photo AS rectificationPhotoStr,
             ph.peasant_household_no as powerStationCode,
             ph.owners_name AS ownersName,
             ph.project_address_name AS powerStationAddress,

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/AcceptanceRectificationOrderServiceImpl.java

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.hygf.api.dto.AcceptanceRectificationOrderDto;
+import com.yeejoin.amos.boot.module.hygf.api.dto.FileItemDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.StandardDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.VariableDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.AcceptanceRectificationOrder;
@@ -25,6 +29,7 @@ import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -62,7 +67,18 @@ public class AcceptanceRectificationOrderServiceImpl extends BaseService<Accepta
     }
 
     public AcceptanceRectificationOrderDto queryBySequenceNbr(Long sequenceNbr) {
-        return acceptanceRectificationOrderMapper.queryBySequenceNbr(sequenceNbr);
+        AcceptanceRectificationOrderDto dto = acceptanceRectificationOrderMapper.queryBySequenceNbr(sequenceNbr);
+        if (StringUtils.isNotEmpty(dto.getRectificationPhotoStr())) {
+            JSONArray jsonArray = JSONArray.parseArray(dto.getRectificationPhotoStr());
+            List<FileItemDto> itemDtos = new ArrayList<>();
+            for (Object obj : jsonArray) {
+                String jsonString = JSONObject.toJSONString(obj);
+                FileItemDto itemDto = JSONObject.parseObject(jsonString, FileItemDto.class);
+                itemDtos.add(itemDto);
+            }
+            dto.setRectificationPhoto(itemDtos);
+        }
+        return dto;
     }
 
     /**