优化工作单

java110-bean/src/main/java/com/java110/dto/workPool/WorkPoolDto.java

@@ -55,6 +55,8 @@ public class WorkPoolDto extends PageDto implements Serializable {
 
     private String content;
 
+    private String pathUrl;
+
 
     public String getWorkCycle() {
         return workCycle;
@@ -224,4 +226,12 @@ public class WorkPoolDto extends PageDto implements Serializable {
     public void setContent(String content) {
         this.content = content;
     }
+
+    public String getPathUrl() {
+        return pathUrl;
+    }
+
+    public void setPathUrl(String pathUrl) {
+        this.pathUrl = pathUrl;
+    }
 }

java110-bean/src/main/java/com/java110/dto/workPoolContent/WorkPoolContentDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.workPoolContent;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,10 +16,10 @@ import java.util.Date;
 public class WorkPoolContentDto extends PageDto implements Serializable {
 
     private String contentId;
-private String communityId;
-private String storeId;
-private String workId;
-private String content;
+    private String communityId;
+    private String storeId;
+    private String workId;
+    private String content;
 
 
     private Date createTime;
@@ -29,31 +30,40 @@ private String content;
     public String getContentId() {
         return contentId;
     }
-public void setContentId(String contentId) {
+
+    public void setContentId(String contentId) {
         this.contentId = contentId;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getStoreId() {
+
+    public String getStoreId() {
         return storeId;
     }
-public void setStoreId(String storeId) {
+
+    public void setStoreId(String storeId) {
         this.storeId = storeId;
     }
-public String getWorkId() {
+
+    public String getWorkId() {
         return workId;
     }
-public void setWorkId(String workId) {
+
+    public void setWorkId(String workId) {
         this.workId = workId;
     }
-public String getContent() {
+
+    public String getContent() {
         return content;
     }
-public void setContent(String content) {
+
+    public void setContent(String content) {
         this.content = content;
     }
 

service-oa/src/main/java/com/java110/oa/cmd/work/DeleteWorkPoolCmd.java

@@ -22,8 +22,14 @@ 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.intf.oa.IWorkPoolV1InnerServiceSMO;
+import com.java110.intf.oa.*;
+import com.java110.intf.user.IUserV1InnerServiceSMO;
+import com.java110.po.workCopy.WorkCopyPo;
+import com.java110.po.workCycle.WorkCyclePo;
 import com.java110.po.workPool.WorkPoolPo;
+import com.java110.po.workPoolContent.WorkPoolContentPo;
+import com.java110.po.workPoolFile.WorkPoolFilePo;
+import com.java110.po.workTask.WorkTaskPo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
@@ -48,6 +54,23 @@ public class DeleteWorkPoolCmd extends Cmd {
     @Autowired
     private IWorkPoolV1InnerServiceSMO workPoolV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IWorkPoolContentV1InnerServiceSMO workPoolContentV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IWorkPoolFileV1InnerServiceSMO workPoolFileV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IWorkCycleV1InnerServiceSMO workCycleV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IWorkTaskV1InnerServiceSMO workTaskV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IWorkCopyV1InnerServiceSMO workCopyV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "workId", "workId不能为空");
@@ -66,6 +89,38 @@ public class DeleteWorkPoolCmd extends Cmd {
             throw new CmdException("删除数据失败");
         }
 
+
+        WorkPoolContentPo workPoolContentPo = null;
+
+        workPoolContentPo = new WorkPoolContentPo();
+        workPoolContentPo.setWorkId(workPoolPo.getWorkId());
+        workPoolContentPo.setStoreId(workPoolPo.getStoreId());
+        workPoolContentV1InnerServiceSMOImpl.deleteWorkPoolContent(workPoolContentPo);
+
+
+        WorkTaskPo workTaskPo = new WorkTaskPo();
+        workTaskPo.setWorkId(workPoolPo.getWorkId());
+        workTaskPo.setStoreId(workPoolPo.getStoreId());
+        workTaskV1InnerServiceSMOImpl.deleteWorkTask(workTaskPo);
+
+        WorkPoolFilePo workPoolFilePo = new WorkPoolFilePo();
+        workPoolFilePo.setWorkId(workPoolPo.getWorkId());
+        workPoolFilePo.setStoreId(workPoolPo.getStoreId());
+        workPoolFileV1InnerServiceSMOImpl.deleteWorkPoolFile(workPoolFilePo);
+
+        WorkCyclePo workCyclePo = new WorkCyclePo();
+        workCyclePo.setWorkId(workPoolPo.getWorkId());
+        workCyclePo.setCommunityId(workPoolPo.getCommunityId());
+        workCyclePo.setStoreId(workPoolPo.getStoreId());
+        workCycleV1InnerServiceSMOImpl.deleteWorkCycle(workCyclePo);
+
+        WorkCopyPo workCopyPo = null;
+        workCopyPo = new WorkCopyPo();
+        workCopyPo.setStoreId(reqJson.getString("storeId"));
+        workCopyPo.setWorkId(workPoolPo.getWorkId());
+
+        workCopyV1InnerServiceSMOImpl.deleteWorkCopy(workCopyPo);
+
         cmdDataFlowContext.setResponseEntity(ResultVo.success());
     }
 }

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

@@ -22,7 +22,9 @@ import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.dto.workPoolContent.WorkPoolContentDto;
+import com.java110.dto.workPoolFile.WorkPoolFileDto;
 import com.java110.intf.oa.IWorkPoolContentV1InnerServiceSMO;
+import com.java110.intf.oa.IWorkPoolFileV1InnerServiceSMO;
 import com.java110.intf.oa.IWorkPoolV1InnerServiceSMO;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.BeanConvertUtil;
@@ -30,8 +32,10 @@ import com.java110.utils.util.ListUtil;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import com.java110.dto.workPool.WorkPoolDto;
+
 import java.util.List;
 import java.util.ArrayList;
+
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.HttpStatus;
 import org.slf4j.Logger;
@@ -51,42 +55,45 @@ import org.slf4j.LoggerFactory;
 @Java110Cmd(serviceCode = "work.listWorkPool")
 public class ListWorkPoolCmd extends Cmd {
 
-  private static Logger logger = LoggerFactory.getLogger(ListWorkPoolCmd.class);
+    private static Logger logger = LoggerFactory.getLogger(ListWorkPoolCmd.class);
     @Autowired
     private IWorkPoolV1InnerServiceSMO workPoolV1InnerServiceSMOImpl;
 
     @Autowired
     private IWorkPoolContentV1InnerServiceSMO workPoolContentV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IWorkPoolFileV1InnerServiceSMO workPoolFileV1InnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         super.validatePageInfo(reqJson);
         String storeId = CmdContextUtils.getStoreId(cmdDataFlowContext);
-        reqJson.put("storeId",storeId);
+        reqJson.put("storeId", storeId);
     }
 
     @Override
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
-           WorkPoolDto workPoolDto = BeanConvertUtil.covertBean(reqJson, WorkPoolDto.class);
+        WorkPoolDto workPoolDto = BeanConvertUtil.covertBean(reqJson, WorkPoolDto.class);
 
-           int count = workPoolV1InnerServiceSMOImpl.queryWorkPoolsCount(workPoolDto);
+        int count = workPoolV1InnerServiceSMOImpl.queryWorkPoolsCount(workPoolDto);
 
-           List<WorkPoolDto> workPoolDtos = null;
+        List<WorkPoolDto> workPoolDtos = null;
 
-           if (count > 0) {
-               workPoolDtos = workPoolV1InnerServiceSMOImpl.queryWorkPools(workPoolDto);
-           } else {
-               workPoolDtos = new ArrayList<>();
-           }
+        if (count > 0) {
+            workPoolDtos = workPoolV1InnerServiceSMOImpl.queryWorkPools(workPoolDto);
+        } else {
+            workPoolDtos = new ArrayList<>();
+        }
 
-        queryContent(workPoolDtos);
+        queryContentAndFile(workPoolDtos);
 
-           ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, workPoolDtos);
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, workPoolDtos);
 
-           ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
 
-           cmdDataFlowContext.setResponseEntity(responseEntity);
+        cmdDataFlowContext.setResponseEntity(responseEntity);
     }
 
     /**
@@ -94,7 +101,7 @@ public class ListWorkPoolCmd extends Cmd {
      *
      * @param workPoolDtos
      */
-    private void queryContent(List<WorkPoolDto> workPoolDtos) {
+    private void queryContentAndFile(List<WorkPoolDto> workPoolDtos) {
         if (ListUtil.isNull(workPoolDtos)) {
             return;
         }
@@ -113,5 +120,17 @@ public class ListWorkPoolCmd extends Cmd {
         }
 
         workPoolDtos.get(0).setContent(workPoolContentDtos.get(0).getContent());
+
+        WorkPoolFileDto workPoolFileDto = new WorkPoolFileDto();
+        workPoolFileDto.setWorkId(workPoolDtos.get(0).getWorkId());
+        workPoolFileDto.setFileType(WorkPoolFileDto.FILE_TYPE_START);
+        List<WorkPoolFileDto> workPoolFileDtos = workPoolFileV1InnerServiceSMOImpl.queryWorkPoolFiles(workPoolFileDto);
+
+        if (ListUtil.isNull(workPoolFileDtos)) {
+            return;
+        }
+
+        workPoolDtos.get(0).setPathUrl(workPoolFileDtos.get(0).getPathUrl());
     }
+
 }

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

@@ -9,11 +9,9 @@ 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.intf.oa.IWorkCopyV1InnerServiceSMO;
-import com.java110.intf.oa.IWorkPoolContentV1InnerServiceSMO;
-import com.java110.intf.oa.IWorkPoolV1InnerServiceSMO;
-import com.java110.intf.oa.IWorkTaskV1InnerServiceSMO;
+import com.java110.intf.oa.*;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.ListUtil;
@@ -41,6 +39,9 @@ public class QueryStartWorkCmd extends Cmd {
     @Autowired
     private IWorkCopyV1InnerServiceSMO workCopyV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IWorkPoolFileV1InnerServiceSMO workPoolFileV1InnerServiceSMOImpl;
+
     @Autowired
     private IWorkPoolContentV1InnerServiceSMO workPoolContentV1InnerServiceSMOImpl;
 
@@ -73,7 +74,7 @@ public class QueryStartWorkCmd extends Cmd {
         queryTaskAndCopy(workPoolDtos);
 
         //todo 查询内容
-        queryContent(workPoolDtos);
+        queryContentAndFile(workPoolDtos);
 
         ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, workPoolDtos);
 
@@ -87,7 +88,7 @@ public class QueryStartWorkCmd extends Cmd {
      *
      * @param workPoolDtos
      */
-    private void queryContent(List<WorkPoolDto> workPoolDtos) {
+    private void queryContentAndFile(List<WorkPoolDto> workPoolDtos) {
         if (ListUtil.isNull(workPoolDtos)) {
             return;
         }
@@ -106,6 +107,17 @@ public class QueryStartWorkCmd extends Cmd {
         }
 
         workPoolDtos.get(0).setContent(workPoolContentDtos.get(0).getContent());
+
+        WorkPoolFileDto workPoolFileDto = new WorkPoolFileDto();
+        workPoolFileDto.setWorkId(workPoolDtos.get(0).getWorkId());
+        workPoolFileDto.setFileType(WorkPoolFileDto.FILE_TYPE_START);
+       List<WorkPoolFileDto> workPoolFileDtos = workPoolFileV1InnerServiceSMOImpl.queryWorkPoolFiles(workPoolFileDto);
+
+        if (ListUtil.isNull(workPoolFileDtos)) {
+            return;
+        }
+
+        workPoolDtos.get(0).setPathUrl(workPoolFileDtos.get(0).getPathUrl());
     }
 
     private void queryTaskAndCopy(List<WorkPoolDto> workPoolDtos) {