From becc16e36e8fdad39eb32661acb73375c6cbdfb4 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期日, 30 三月 2025 18:00:45 +0800
Subject: [PATCH] 工作单支持多图片
---
service-oa/src/main/java/com/java110/oa/cmd/work/ListWorkPoolCmd.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/service-oa/src/main/java/com/java110/oa/cmd/work/ListWorkPoolCmd.java b/service-oa/src/main/java/com/java110/oa/cmd/work/ListWorkPoolCmd.java
index b7eb16f..92d1117 100644
--- a/service-oa/src/main/java/com/java110/oa/cmd/work/ListWorkPoolCmd.java
+++ b/service-oa/src/main/java/com/java110/oa/cmd/work/ListWorkPoolCmd.java
@@ -21,10 +21,7 @@
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
-import com.java110.dto.work.WorkCopyDto;
-import com.java110.dto.work.WorkPoolContentDto;
-import com.java110.dto.work.WorkPoolFileDto;
-import com.java110.dto.work.WorkTaskDto;
+import com.java110.dto.work.*;
import com.java110.intf.oa.*;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.MappingConstant;
@@ -33,7 +30,6 @@
import com.java110.utils.util.ListUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
-import com.java110.dto.work.WorkPoolDto;
import java.util.List;
import java.util.ArrayList;
@@ -143,9 +139,18 @@
return;
}
+ List<String> pathUrls = null;
String imgUrl = MappingCache.getValue(MappingConstant.FILE_DOMAIN, "IMG_PATH");
- workPoolDtos.get(0).setPathUrl(imgUrl + workPoolFileDtos.get(0).getPathUrl());
+ pathUrls = new ArrayList<>();
+ for (WorkPoolFileDto tWorkPoolFileDto : workPoolFileDtos) {
+ if (tWorkPoolFileDto.getPathUrl().startsWith("http")) {
+ pathUrls.add(tWorkPoolFileDto.getPathUrl());
+ }else{
+ pathUrls.add(imgUrl + tWorkPoolFileDto.getPathUrl());
+ }
+ }
+ workPoolDtos.get(0).setPathUrls(pathUrls);
}
private void queryTaskAndCopy(List<WorkPoolDto> workPoolDtos) {
@@ -192,10 +197,10 @@
List<WorkCopyDto> workCopyDtos = workCopyV1InnerServiceSMOImpl.queryWorkCopys(workCopyDto);
String curCopyName = "";
- String copyName ;
+ String copyName;
for (WorkPoolDto workPoolDto : workPoolDtos) {
curCopyName = "";
- copyName= "";
+ copyName = "";
for (WorkCopyDto tmpWorkCopyDto : workCopyDtos) {
--
Gitblit v1.8.0