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/SaveWorkPoolCmd.java |   45 ++++++++++++++++++++++++++++-----------------
 1 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/service-oa/src/main/java/com/java110/oa/cmd/work/SaveWorkPoolCmd.java b/service-oa/src/main/java/com/java110/oa/cmd/work/SaveWorkPoolCmd.java
index cbcef6e..39268bb 100644
--- a/service-oa/src/main/java/com/java110/oa/cmd/work/SaveWorkPoolCmd.java
+++ b/service-oa/src/main/java/com/java110/oa/cmd/work/SaveWorkPoolCmd.java
@@ -158,8 +158,8 @@
         List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
         Assert.listOnlyOne(userDtos, "鐢ㄦ埛鏈櫥褰�");
         String workName = reqJson.getString("workName");
-        if(StringUtil.isEmpty(workName)){
-            reqJson.put("workName",userDtos.get(0).getName()+"鍙戣捣鐨勫伐浣滃崟");
+        if (StringUtil.isEmpty(workName)) {
+            reqJson.put("workName", userDtos.get(0).getName() + "鍙戣捣鐨勫伐浣滃崟");
         }
         WorkPoolPo workPoolPo = BeanConvertUtil.covertBean(reqJson, WorkPoolPo.class);
         workPoolPo.setWorkId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
@@ -173,6 +173,9 @@
         }
         //todo 淇濆瓨 宸ヤ綔鍗曞唴瀹�
         saveContent(workPoolPo, reqJson, userDtos.get(0));
+
+        //todo 淇濆瓨 鎻愪氦闄勪欢
+        saveFile(workPoolPo,reqJson,userDtos.get(0));
         //todo 淇濆瓨 鎶勯�佷汉
         saveCopyStaff(workPoolPo, reqJson, userDtos.get(0));
         //todo 淇濆瓨鍛ㄦ湡
@@ -181,6 +184,8 @@
         saveWorkTask(workPoolPo, reqJson, userDtos.get(0));
         cmdDataFlowContext.setResponseEntity(ResultVo.success());
     }
+
+
 
     private void saveWorkTask(WorkPoolPo workPoolPo, JSONObject reqJson, UserDto userDto) {
         JSONArray staffs = reqJson.getJSONArray("staffs");
@@ -224,21 +229,6 @@
                 workTaskItemPo.setTaskId(workTaskPo.getTaskId());
                 workTaskItemV1InnerServiceSMOImpl.saveWorkTaskItem(workTaskItemPo);
             }
-
-            if (StringUtil.isEmpty(reqJson.getString("pathUrl"))) {
-                continue;
-            }
-            WorkPoolFilePo workPoolFilePo = new WorkPoolFilePo();
-            workPoolFilePo.setCommunityId(workPoolPo.getCommunityId());
-            workPoolFilePo.setFileType(WorkPoolFileDto.FILE_TYPE_START);
-            workPoolFilePo.setFileId(GenerateCodeFactory.getGeneratorId("11"));
-            workPoolFilePo.setWorkId(workPoolPo.getWorkId());
-            workPoolFilePo.setTaskId(workTaskPo.getTaskId());
-            workPoolFilePo.setPathUrl(reqJson.getString("pathUrl"));
-            workPoolFilePo.setStoreId(workPoolPo.getStoreId());
-            workPoolFilePo.setItemId("-1");
-            workPoolFilePo.setContentId("-1");
-            workPoolFileV1InnerServiceSMOImpl.saveWorkPoolFile(workPoolFilePo);
         }
     }
 
@@ -339,4 +329,25 @@
             workPoolContentV1InnerServiceSMOImpl.saveWorkPoolContent(workPoolContentPo);
         }
     }
+
+    private void saveFile(WorkPoolPo workPoolPo, JSONObject reqJson, UserDto userDto) {
+
+        JSONArray pathUrls = reqJson.getJSONArray("pathUrls");
+        if (ListUtil.isNull(pathUrls)) {
+            return;
+        }
+        for (int urlIndex = 0; urlIndex < pathUrls.size(); urlIndex++) {
+            WorkPoolFilePo workPoolFilePo = new WorkPoolFilePo();
+            workPoolFilePo.setCommunityId(workPoolPo.getCommunityId());
+            workPoolFilePo.setFileType(WorkPoolFileDto.FILE_TYPE_START);
+            workPoolFilePo.setFileId(GenerateCodeFactory.getGeneratorId("11"));
+            workPoolFilePo.setWorkId(workPoolPo.getWorkId());
+            workPoolFilePo.setTaskId("-1");
+            workPoolFilePo.setPathUrl(pathUrls.getString(urlIndex));
+            workPoolFilePo.setStoreId(workPoolPo.getStoreId());
+            workPoolFilePo.setItemId("-1");
+            workPoolFilePo.setContentId("-1");
+            workPoolFileV1InnerServiceSMOImpl.saveWorkPoolFile(workPoolFilePo);
+        }
+    }
 }

--
Gitblit v1.8.0