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/QueryStartWorkCmd.java | 35 +++++++++++++++++++++++++----------
1 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/service-oa/src/main/java/com/java110/oa/cmd/work/QueryStartWorkCmd.java b/service-oa/src/main/java/com/java110/oa/cmd/work/QueryStartWorkCmd.java
index 9aca70f..25e0a39 100644
--- a/service-oa/src/main/java/com/java110/oa/cmd/work/QueryStartWorkCmd.java
+++ b/service-oa/src/main/java/com/java110/oa/cmd/work/QueryStartWorkCmd.java
@@ -6,12 +6,14 @@
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
-import com.java110.dto.workCopy.WorkCopyDto;
-import com.java110.dto.workPool.WorkPoolDto;
-import com.java110.dto.workPoolContent.WorkPoolContentDto;
-import com.java110.dto.workPoolFile.WorkPoolFileDto;
-import com.java110.dto.workTask.WorkTaskDto;
+import com.java110.dto.work.WorkCopyDto;
+import com.java110.dto.work.WorkPoolDto;
+import com.java110.dto.work.WorkPoolContentDto;
+import com.java110.dto.work.WorkPoolFileDto;
+import com.java110.dto.work.WorkTaskDto;
import com.java110.intf.oa.*;
+import com.java110.utils.cache.MappingCache;
+import com.java110.utils.constant.MappingConstant;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.ListUtil;
@@ -58,7 +60,7 @@
WorkPoolDto workPoolDto = BeanConvertUtil.covertBean(reqJson, WorkPoolDto.class);
String userId = CmdContextUtils.getUserId(context);
- workPoolDto.setCreateUserId(userId);
+ //workPoolDto.setCreateUserId(userId);
int count = workPoolV1InnerServiceSMOImpl.queryWorkPoolsCount(workPoolDto);
@@ -107,17 +109,30 @@
}
workPoolDtos.get(0).setContent(workPoolContentDtos.get(0).getContent());
+ workPoolDtos.get(0).setContents(workPoolContentDtos);
WorkPoolFileDto workPoolFileDto = new WorkPoolFileDto();
workPoolFileDto.setWorkId(workPoolDtos.get(0).getWorkId());
workPoolFileDto.setFileType(WorkPoolFileDto.FILE_TYPE_START);
- List<WorkPoolFileDto> workPoolFileDtos = workPoolFileV1InnerServiceSMOImpl.queryWorkPoolFiles(workPoolFileDto);
+ List<WorkPoolFileDto> workPoolFileDtos = workPoolFileV1InnerServiceSMOImpl.queryWorkPoolFiles(workPoolFileDto);
if (ListUtil.isNull(workPoolFileDtos)) {
return;
}
+ String imgUrl = MappingCache.getValue(MappingConstant.FILE_DOMAIN, "IMG_PATH");
- workPoolDtos.get(0).setPathUrl(workPoolFileDtos.get(0).getPathUrl());
+ List<String> 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) {
@@ -138,7 +153,7 @@
for (WorkPoolDto workPoolDto : workPoolDtos) {
curStaffName = "";
for (WorkTaskDto tmpWorkTaskDto : workTaskDtos) {
- if (!WorkTaskDto.STATE_DOING.equals(tmpWorkTaskDto.getState())) {
+ if (!WorkTaskDto.STATE_WAIT.equals(tmpWorkTaskDto.getState())) {
continue;
}
@@ -164,7 +179,7 @@
for (WorkPoolDto workPoolDto : workPoolDtos) {
curCopyName = "";
for (WorkCopyDto tmpWorkCopyDto : workCopyDtos) {
- if (!WorkTaskDto.STATE_DOING.equals(tmpWorkCopyDto.getState())) {
+ if (!WorkTaskDto.STATE_WAIT.equals(tmpWorkCopyDto.getState())) {
continue;
}
--
Gitblit v1.8.0