wuxw пре 1 година
родитељ
комит
becc16e36e

+ 18 - 0
java110-bean/src/main/java/com/java110/dto/work/WorkPoolDto.java

@@ -60,7 +60,9 @@ public class WorkPoolDto extends PageDto implements Serializable {
     private String content;
 
     private String pathUrl;
+    private List<String> pathUrls;
     private String url;
+    private List<String> urls;
 
     private String taskId;
 
@@ -410,4 +412,20 @@ public class WorkPoolDto extends PageDto implements Serializable {
     public void setCopyName(String copyName) {
         this.copyName = copyName;
     }
+
+    public List<String> getPathUrls() {
+        return pathUrls;
+    }
+
+    public void setPathUrls(List<String> pathUrls) {
+        this.pathUrls = pathUrls;
+    }
+
+    public List<String> getUrls() {
+        return urls;
+    }
+
+    public void setUrls(List<String> urls) {
+        this.urls = urls;
+    }
 }

+ 9 - 0
java110-bean/src/main/java/com/java110/dto/work/WorkPoolFileDto.java

@@ -35,6 +35,7 @@ public class WorkPoolFileDto extends PageDto implements Serializable {
     private String queryEndTime;
 
     private String itemId;
+    private String[] itemIds;
 
     private String contentId;
     private Date createTime;
@@ -162,4 +163,12 @@ public class WorkPoolFileDto extends PageDto implements Serializable {
     public void setContentId(String contentId) {
         this.contentId = contentId;
     }
+
+    public String[] getItemIds() {
+        return itemIds;
+    }
+
+    public void setItemIds(String[] itemIds) {
+        this.itemIds = itemIds;
+    }
 }

+ 11 - 0
java110-bean/src/main/java/com/java110/dto/work/WorkTaskItemDto.java

@@ -2,6 +2,7 @@ package com.java110.dto.work;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @ClassName FloorDto
@@ -48,6 +49,8 @@ public class WorkTaskItemDto extends WorkPoolContentDto implements Serializable
 
     private String score;
 
+    private List<String> pathUrls;
+
 
 
     public String getDeductionPersonId() {
@@ -242,4 +245,12 @@ public class WorkTaskItemDto extends WorkPoolContentDto implements Serializable
     public void setStates(String[] states) {
         this.states = states;
     }
+
+    public List<String> getPathUrls() {
+        return pathUrls;
+    }
+
+    public void setPathUrls(List<String> pathUrls) {
+        this.pathUrls = pathUrls;
+    }
 }

+ 1 - 2
java110-db/src/main/resources/mapper/oa/WorkTaskItemV1ServiceDaoImplMapper.xml

@@ -27,11 +27,10 @@ wpc.status_cd = '0' 删掉有可能前台做了修改
         deductionPersonName,t.deduction_money deductionMoney,t.content_id contentId,t.status_cd statusCd,t.store_id
         storeId,t.work_id workId,t.deduction_reason deductionReason,t.item_id itemId,t.state,t.community_id
         communityId,t.task_id taskId,wpc.content,we.staff_name staffName,we.remark,t.create_time createTime,
-        wpf.path_url pathUrl,t.score
+        t.score
         from work_task_item t
         left join work_pool_content wpc on t.content_id = wpc.content_id
         left join work_event we on t.item_id = we.item_id and we.status_cd = '0' and we.event_type = '1001'
-        left join work_pool_file wpf on t.item_id = wpf.item_id and wpf.status_cd = '0'
         where 1 =1
         <if test="deductionPersonId !=null and deductionPersonId != ''">
             and t.deduction_person_id= #{deductionPersonId}

+ 2 - 9
service-community/src/main/java/com/java110/community/cmd/community/ListMyEnteredCommunitysCmd.java

@@ -54,16 +54,9 @@ public class ListMyEnteredCommunitysCmd extends Cmd {
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
 
-        String storeId = reqJson.getString("storeId");
-        String userId = reqJson.getString("userId");
-        if (StringUtil.isEmpty(storeId)) {
-            reqJson.put("storeId", CmdContextUtils.getStoreId(cmdDataFlowContext));
-        }
-
-        if (StringUtil.isEmpty(userId)) {
-            reqJson.put("userId", CmdContextUtils.getUserId(cmdDataFlowContext));
-        }
 
+        reqJson.put("storeId", CmdContextUtils.getStoreId(cmdDataFlowContext));
+        reqJson.put("userId", CmdContextUtils.getUserId(cmdDataFlowContext));
         Assert.hasKeyAndValue(reqJson, "storeId", "请求报文中未包含商户信息");
         Assert.hasKeyAndValue(reqJson, "userId", "请求报文中未包含用户信息");
     }

+ 16 - 16
service-oa/src/main/java/com/java110/oa/cmd/work/FinishWorkTaskCmd.java

@@ -1,5 +1,6 @@
 package com.java110.oa.cmd.work;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.context.CmdContextUtils;
@@ -102,28 +103,27 @@ public class FinishWorkTaskCmd extends Cmd {
             doFinish(reqJson, workTaskDtos.get(0), workTaskItemDtos.get(0));
         }
 
-        if (!reqJson.containsKey("pathUrl")) {
-            return;
-        }
 
-        String pathUrl = reqJson.getString("pathUrl");
-        if (StringUtil.isEmpty(pathUrl)) {
+        JSONArray pathUrls = reqJson.getJSONArray("pathUrls");
+        if (ListUtil.isNull(pathUrls)) {
             return;
         }
 
-        WorkPoolFilePo workPoolFilePo = new WorkPoolFilePo();
-        workPoolFilePo.setCommunityId(workTaskDtos.get(0).getCommunityId());
-        workPoolFilePo.setFileType(WorkPoolFileDto.FILE_TYPE_END);
-        workPoolFilePo.setFileId(GenerateCodeFactory.getGeneratorId("11"));
-        workPoolFilePo.setWorkId(workTaskDtos.get(0).getWorkId());
-        workPoolFilePo.setTaskId(workTaskDtos.get(0).getTaskId());
-        workPoolFilePo.setPathUrl(reqJson.getString("pathUrl"));
-        workPoolFilePo.setStoreId(workTaskDtos.get(0).getStoreId());
-        workPoolFilePo.setItemId(reqJson.getString("itemId"));
+        for (int urlIndex = 0; urlIndex < pathUrls.size(); urlIndex++) {
+            WorkPoolFilePo workPoolFilePo = new WorkPoolFilePo();
+            workPoolFilePo.setCommunityId(workTaskDtos.get(0).getCommunityId());
+            workPoolFilePo.setFileType(WorkPoolFileDto.FILE_TYPE_END);
+            workPoolFilePo.setFileId(GenerateCodeFactory.getGeneratorId("11"));
+            workPoolFilePo.setWorkId(workTaskDtos.get(0).getWorkId());
+            workPoolFilePo.setTaskId(workTaskDtos.get(0).getTaskId());
+            workPoolFilePo.setPathUrl(pathUrls.getString(urlIndex));
+            workPoolFilePo.setStoreId(workTaskDtos.get(0).getStoreId());
+            workPoolFilePo.setItemId(reqJson.getString("itemId"));
 
-        workPoolFilePo.setContentId(workTaskItemDtos.get(0).getContentId());
+            workPoolFilePo.setContentId(workTaskItemDtos.get(0).getContentId());
 
-        workPoolFileV1InnerServiceSMOImpl.saveWorkPoolFile(workPoolFilePo);
+            workPoolFileV1InnerServiceSMOImpl.saveWorkPoolFile(workPoolFilePo);
+        }
 
     }
 

+ 13 - 8
service-oa/src/main/java/com/java110/oa/cmd/work/ListWorkPoolCmd.java

@@ -21,10 +21,7 @@ import com.java110.core.context.CmdContextUtils;
 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.BeanConvertUtil;
 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 @@ public class ListWorkPoolCmd extends Cmd {
             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 @@ public class ListWorkPoolCmd extends Cmd {
         List<WorkCopyDto> workCopyDtos = workCopyV1InnerServiceSMOImpl.queryWorkCopys(workCopyDto);
 
         String curCopyName = "";
-        String copyName ;
+        String copyName;
         for (WorkPoolDto workPoolDto : workPoolDtos) {
             curCopyName = "";
-            copyName= "";
+            copyName = "";
             for (WorkCopyDto tmpWorkCopyDto : workCopyDtos) {
 
 

+ 53 - 19
service-oa/src/main/java/com/java110/oa/cmd/work/ListWorkTaskItemCmd.java

@@ -21,17 +21,21 @@ 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.WorkPoolFileDto;
+import com.java110.intf.oa.IWorkPoolFileV1InnerServiceSMO;
 import com.java110.intf.oa.IWorkTaskItemV1InnerServiceSMO;
 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;
 import com.java110.utils.util.StringUtil;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import com.java110.dto.work.WorkTaskItemDto;
+
 import java.util.List;
 import java.util.ArrayList;
+
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.HttpStatus;
 import org.slf4j.Logger;
@@ -51,10 +55,13 @@ import org.slf4j.LoggerFactory;
 @Java110Cmd(serviceCode = "task.listWorkTaskItem")
 public class ListWorkTaskItemCmd extends Cmd {
 
-  private static Logger logger = LoggerFactory.getLogger(ListWorkTaskItemCmd.class);
+    private static Logger logger = LoggerFactory.getLogger(ListWorkTaskItemCmd.class);
     @Autowired
     private IWorkTaskItemV1InnerServiceSMO workTaskItemV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IWorkPoolFileV1InnerServiceSMO workPoolFileV1InnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         super.validatePageInfo(reqJson);
@@ -64,31 +71,58 @@ public class ListWorkTaskItemCmd extends Cmd {
     @Override
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
-           WorkTaskItemDto workTaskItemDto = BeanConvertUtil.covertBean(reqJson, WorkTaskItemDto.class);
+        WorkTaskItemDto workTaskItemDto = BeanConvertUtil.covertBean(reqJson, WorkTaskItemDto.class);
+
+        int count = workTaskItemV1InnerServiceSMOImpl.queryWorkTaskItemsCount(workTaskItemDto);
 
-           int count = workTaskItemV1InnerServiceSMOImpl.queryWorkTaskItemsCount(workTaskItemDto);
+        List<WorkTaskItemDto> workTaskItemDtos = null;
 
-           List<WorkTaskItemDto> workTaskItemDtos = null;
+        if (count > 0) {
+            workTaskItemDtos = workTaskItemV1InnerServiceSMOImpl.queryWorkTaskItems(workTaskItemDto);
 
-           if (count > 0) {
-               workTaskItemDtos = workTaskItemV1InnerServiceSMOImpl.queryWorkTaskItems(workTaskItemDto);
-               String imgUrl = MappingCache.getValue(MappingConstant.FILE_DOMAIN, "IMG_PATH");
+            queryTaskFile(workTaskItemDtos);
 
-               for (WorkTaskItemDto tmpWorkTaskItemDto : workTaskItemDtos) {
-                   if(StringUtil.isEmpty(tmpWorkTaskItemDto.getPathUrl())){
-                       continue;
-                   }
-                   tmpWorkTaskItemDto.setPathUrl(imgUrl + tmpWorkTaskItemDto.getPathUrl());
-               }
+        } else {
+            workTaskItemDtos = new ArrayList<>();
+        }
 
-           } else {
-               workTaskItemDtos = new ArrayList<>();
-           }
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, workTaskItemDtos);
 
-           ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, workTaskItemDtos);
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
 
-           ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+        cmdDataFlowContext.setResponseEntity(responseEntity);
+    }
+
+    private void queryTaskFile(List<WorkTaskItemDto> workTaskItemDtos) {
+        if (ListUtil.isNull(workTaskItemDtos)) {
+            return;
+        }
+        List<String> itemIds = new ArrayList<>();
+        for (WorkTaskItemDto workTaskItemDto : workTaskItemDtos) {
+            itemIds.add(workTaskItemDto.getItemId());
+        }
+
+        WorkPoolFileDto workPoolFileDto = new WorkPoolFileDto();
+        workPoolFileDto.setFileType(WorkPoolFileDto.FILE_TYPE_END);
+        workPoolFileDto.setItemIds(itemIds.toArray(new String[itemIds.size()]));
+        List<WorkPoolFileDto> workPoolFileDtos = workPoolFileV1InnerServiceSMOImpl.queryWorkPoolFiles(workPoolFileDto);
+        if (ListUtil.isNull(workPoolFileDtos)) {
+            return;
+        }
+        List<String> pathUrls = null;
+        String imgUrl = MappingCache.getValue(MappingConstant.FILE_DOMAIN, "IMG_PATH");
 
-           cmdDataFlowContext.setResponseEntity(responseEntity);
+        for (WorkTaskItemDto workTaskItemDto : workTaskItemDtos) {
+            pathUrls = new ArrayList<>();
+            for (WorkPoolFileDto tWorkPoolFileDto : workPoolFileDtos) {
+                if (!workTaskItemDto.getItemId().equals(tWorkPoolFileDto.getItemId())) {
+                    continue;
+                }
+                pathUrls.add(imgUrl + tWorkPoolFileDto.getPathUrl());
+            }
+            workTaskItemDto.setPathUrls(pathUrls);
+        }
     }
+
+
 }

+ 8 - 7
service-oa/src/main/java/com/java110/oa/cmd/work/QueryStartWorkCmd.java

@@ -119,17 +119,18 @@ public class QueryStartWorkCmd extends Cmd {
         if (ListUtil.isNull(workPoolFileDtos)) {
             return;
         }
-
-        workPoolDtos.get(0).setPathUrl(workPoolFileDtos.get(0).getPathUrl());
-
         String imgUrl = MappingCache.getValue(MappingConstant.FILE_DOMAIN, "IMG_PATH");
 
-        if (workPoolFileDtos.get(0).getPathUrl().startsWith("http")) {
-            workPoolDtos.get(0).setUrl(workPoolFileDtos.get(0).getPathUrl());
-            return;
+        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).setUrl(imgUrl + workPoolFileDtos.get(0).getPathUrl());
+        workPoolDtos.get(0).setPathUrls(pathUrls);
 
 
     }

+ 28 - 17
service-oa/src/main/java/com/java110/oa/cmd/work/SaveWorkPoolCmd.java

@@ -158,8 +158,8 @@ public class SaveWorkPoolCmd extends Cmd {
         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 @@ public class SaveWorkPoolCmd extends Cmd {
         }
         //todo 保存 工作单内容
         saveContent(workPoolPo, reqJson, userDtos.get(0));
+
+        //todo 保存 提交附件
+        saveFile(workPoolPo,reqJson,userDtos.get(0));
         //todo 保存 抄送人
         saveCopyStaff(workPoolPo, reqJson, userDtos.get(0));
         //todo 保存周期
@@ -182,6 +185,8 @@ public class SaveWorkPoolCmd extends Cmd {
         cmdDataFlowContext.setResponseEntity(ResultVo.success());
     }
 
+
+
     private void saveWorkTask(WorkPoolPo workPoolPo, JSONObject reqJson, UserDto userDto) {
         JSONArray staffs = reqJson.getJSONArray("staffs");
         String startTime = reqJson.getString("startTime");
@@ -224,21 +229,6 @@ public class SaveWorkPoolCmd extends Cmd {
                 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 @@ public class SaveWorkPoolCmd extends Cmd {
             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);
+        }
+    }
 }

+ 32 - 18
service-oa/src/main/java/com/java110/oa/cmd/work/UpdateWorkPoolCmd.java

@@ -166,6 +166,10 @@ public class UpdateWorkPoolCmd extends Cmd {
         //todo 保存 工作单内容
         updateContent(workPoolPo, reqJson, userDtos.get(0));
 
+        // todo 修改工作单附件
+        updateFile(workPoolPo, reqJson, userDtos.get(0));
+
+
         //todo 保存 抄送人
         updateCopyStaff(workPoolPo, reqJson, userDtos.get(0));
 
@@ -178,6 +182,7 @@ public class UpdateWorkPoolCmd extends Cmd {
         cmdDataFlowContext.setResponseEntity(ResultVo.success());
     }
 
+
     private void updateWorkTask(WorkPoolPo workPoolPo, JSONObject reqJson, UserDto userDto) {
         JSONArray staffs = reqJson.getJSONArray("staffs");
         String startTime = reqJson.getString("startTime");
@@ -198,10 +203,6 @@ public class UpdateWorkPoolCmd extends Cmd {
         workTaskItemPo.setStoreId(workPoolPo.getStoreId());
         workTaskItemV1InnerServiceSMOImpl.deleteWorkTaskItem(workTaskItemPo);
 
-        WorkPoolFilePo workPoolFilePo = new WorkPoolFilePo();
-        workPoolFilePo.setWorkId(workPoolPo.getWorkId());
-        workPoolFilePo.setStoreId(workPoolPo.getStoreId());
-        workPoolFileV1InnerServiceSMOImpl.deleteWorkPoolFile(workPoolFilePo);
         JSONArray contents = reqJson.getJSONArray("contents");
 
         for (int staffIndex = 0; staffIndex < staffs.size(); staffIndex++) {
@@ -236,20 +237,6 @@ public class UpdateWorkPoolCmd extends Cmd {
                 workTaskItemPo.setTaskId(workTaskPo.getTaskId());
                 workTaskItemV1InnerServiceSMOImpl.saveWorkTaskItem(workTaskItemPo);
             }
-
-            if (StringUtil.isEmpty(reqJson.getString("pathUrl"))) {
-                continue;
-            }
-
-            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());
-            workPoolFileV1InnerServiceSMOImpl.saveWorkPoolFile(workPoolFilePo);
         }
     }
 
@@ -371,4 +358,31 @@ public class UpdateWorkPoolCmd extends Cmd {
             workPoolContentV1InnerServiceSMOImpl.saveWorkPoolContent(workPoolContentPo);
         }
     }
+
+    private void updateFile(WorkPoolPo workPoolPo, JSONObject reqJson, UserDto userDto) {
+        JSONArray pathUrls = reqJson.getJSONArray("pathUrls");
+        if (ListUtil.isNull(pathUrls)) {
+            return;
+        }
+
+        WorkPoolFilePo workPoolFilePo = new WorkPoolFilePo();
+        workPoolFilePo.setWorkId(workPoolPo.getWorkId());
+        workPoolFilePo.setStoreId(workPoolPo.getStoreId());
+        workPoolFileV1InnerServiceSMOImpl.deleteWorkPoolFile(workPoolFilePo);
+
+        for (int urlIndex = 0; urlIndex < pathUrls.size(); urlIndex++) {
+            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);
+        }
+    }
+
 }

+ 4 - 4
service-user/src/main/java/com/java110/user/cmd/user/QueryStaffInfosCmd.java

@@ -92,10 +92,10 @@ public class QueryStaffInfosCmd extends Cmd {
     public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
         Assert.hasKeyAndValue(reqJson, "page", "请求报文中未包含page节点");
         Assert.hasKeyAndValue(reqJson, "row", "请求报文中未包含rows节点");
-        if (!reqJson.containsKey("storeId")) {
-            String storeId = context.getReqHeaders().get("store-id");
-            reqJson.put("storeId", storeId);
-        }
+
+        String storeId = context.getReqHeaders().get("store-id");
+        reqJson.put("storeId", storeId);
+
         Assert.hasKeyAndValue(reqJson, "storeId", "请求报文中未包含storeId节点");
     }