其它文件

src/main/java/com/chinaitop/depot/basic/model/DRyxxsjyVO.java

@@ -343,8 +343,5 @@ public class DRyxxsjyVO {
 	@ApiModelProperty(value = "文件名称")
 	private String fileName;
 
-	@ApiModelProperty(value = "文件url")
-	private String ryfjFileUrl;
-	@ApiModelProperty(value = "文件名称")
-	private String ryfjFileName;
+	private List<RyfjFileVO> ryfjFileVOList;
 }

src/main/java/com/chinaitop/depot/basic/model/RyfjFileVO.java

@@ -0,0 +1,20 @@
+package com.chinaitop.depot.basic.model;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author qingsong.han
+ * @description:
+ * @create 2024-12-18 11:04
+ */
+@Getter
+@Setter
+public class RyfjFileVO {
+
+    @ApiModelProperty(value = "文件url")
+    private String ryfjFileUrl;
+    @ApiModelProperty(value = "文件名称")
+    private String ryfjFileName;
+}

src/main/java/com/chinaitop/depot/basic/service/impl/DRyxxsjyServiceImpl.java

@@ -3,6 +3,7 @@ package com.chinaitop.depot.basic.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.chinaitop.depot.basic.mapper.DRyxxsjyMapper;
 import com.chinaitop.depot.basic.model.DRyxxsjyVO;
+import com.chinaitop.depot.basic.model.RyfjFileVO;
 import com.chinaitop.depot.basic.model.vo.*;
 import com.chinaitop.depot.basic.param.DRyxxsjyPageParam;
 import com.chinaitop.depot.basic.param.FileObject;
@@ -15,6 +16,7 @@ import org.springframework.util.*;
 import org.springframework.web.client.RestTemplate;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.StringJoiner;
 
@@ -116,18 +118,18 @@ public class DRyxxsjyServiceImpl implements DRyxxsjyService {
         // 其它附件
         String ryfjStrS = dRyxxsjyVO.getRyfj();
         if (StringUtils.hasText(ryfjStrS)) {
+            List<RyfjFileVO> ryfjFileVOList = new ArrayList<>();
             String[] ryfjs = ryfjStrS.split(",");
-            StringJoiner link = new StringJoiner(",");
-            StringJoiner name = new StringJoiner(",");
             for (String ryfj : ryfjs) {
                 FileObject data = fileUrlUtil.getData(dRyxxsjyVO.getRyfj());
                 if (!ObjectUtils.isEmpty(data)) {
-                    link.add(data.getLink());
-                    name.add(data.getName());
+                    RyfjFileVO ryfjFileVO = new RyfjFileVO();
+                    ryfjFileVO.setRyfjFileUrl(data.getLink());
+                    ryfjFileVO.setRyfjFileName(data.getName());
+                    ryfjFileVOList.add(ryfjFileVO);
                 }
             }
-            dRyxxsjyVO.setRyfjFileUrl(link.toString());
-            dRyxxsjyVO.setRyfjFileName(name.toString());
+            dRyxxsjyVO.setRyfjFileVOList(ryfjFileVOList);
         }
         // 职务类型变更记录
         List<ZwlxbgjlVO> zwlxbgjlVOList = dRyxxsjyMapper.getZwlxbgjlListById(dRyxxsjyVO.getSfzh());