From db4fa6d2367d5b010d5528b5688c5c241cd2c8f7 Mon Sep 17 00:00:00 2001 From: wangqian <1406304305@qq.com> Date: Fri, 19 Dec 2025 10:31:26 +0800 Subject: [PATCH] 工单管理详情图片返回数组 --- urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/vo/MainInfoRespVO.java | 2 +- urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/convert/maininfo/MainInfoConvert.java | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/vo/MainInfoRespVO.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/vo/MainInfoRespVO.java index 2e461d8..f418cc8 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/vo/MainInfoRespVO.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/vo/MainInfoRespVO.java @@ -136,7 +136,7 @@ public class MainInfoRespVO { private LocalDateTime createTime; @Schema(description = "文件名称") - private String fileNames; + private List fileNames; @Schema(description = "共同处理人") private Set coHandlers; diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/convert/maininfo/MainInfoConvert.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/convert/maininfo/MainInfoConvert.java index 3825c2d..fc36fdb 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/convert/maininfo/MainInfoConvert.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/convert/maininfo/MainInfoConvert.java @@ -10,6 +10,7 @@ import com.zteits.urbanops.module.workorder.dal.dataobject.maininfo.MainInfoDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; +import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.Objects; @@ -31,7 +32,13 @@ public interface MainInfoConvert { MainInfoRespVO mainInfoVo = BeanUtils.toBean(mainInfoDO, MainInfoRespVO.class); if (attachmentMap != null && !attachmentMap.isEmpty()) { AttachmentDO attachmentDO = attachmentMap.get(mainInfoDO.getOrderNo()); - mainInfoVo.setFileNames(attachmentDO.getFileNames()); + String fileNamesStr = attachmentDO.getFileNames(); + List fileNameList = fileNamesStr == null + ? List.of() + : Arrays.stream(fileNamesStr.split(",")) + .filter(fileName -> fileName != null && !fileName.trim().isEmpty()) // 过滤空字符串和空白 + .collect(Collectors.toList()); + mainInfoVo.setFileNames(fileNameList); } return mainInfoVo; }); @@ -43,7 +50,13 @@ public interface MainInfoConvert { if (mainInfoDO != null) { if (attachmentMap != null && !attachmentMap.isEmpty()) { AttachmentDO attachmentDO = attachmentMap.get(mainInfoDO.getOrderNo()); - mainInfoVo.setFileNames(attachmentDO.getFileNames()); + String fileNamesStr = attachmentDO.getFileNames(); + List fileNameList = fileNamesStr == null + ? List.of() + : Arrays.stream(fileNamesStr.split(",")) + .filter(fileName -> fileName != null && !fileName.trim().isEmpty()) // 过滤空字符串和空白 + .collect(Collectors.toList()); + mainInfoVo.setFileNames(fileNameList); } mainInfoVo.setCompanyName(deptName); if (mainInfoVo.getCoHandlers() != null && !mainInfoVo.getCoHandlers().isEmpty()) { -- libgit2 0.21.4