Merge branch 'develop-zhaojw' into develop

jyzb-biz/src/main/java/com/junmp/jyzb/utils/HttpStatus.java

@@ -19,10 +19,11 @@ public class HttpStatus
      */
     public static final int ERROR = 99500;
 
+
     /**
      * 没有操作权限
      */
-    public static final int NO_PERMISSION = 10001;
+    public static final int NO_PERMISSION = 100001;
 
     /**
      * 没有该账户信息
@@ -35,6 +36,19 @@ public class HttpStatus
     public static final int PAGE_NOTFOUND = 100003;
 
     /**
+     * 流程启动失败
+     */
+    public static final int PROCESS_START_ERROR = 100004;
+
+    /**
+     * 流程已经结束
+     */
+    public static final int PROCESS_WAS_END = 100005;
+    /**
+     *没有运行时的任务实例,请确认!
+     */
+    public static final int NO_SUCH_PROCESS = 100006;
+    /**
      * 请求数据超时
      */
     public static final int TIMEOUT = 19996;

jyzb-biz/src/main/java/com/junmp/jyzb/utils/ReturnMsg.java

@@ -12,17 +12,33 @@ public class ReturnMsg {
     public static final String PASS = "操作成功";
 
     /**
+     * 操作成功
+     */
+    public static final String NO_SUCH_PROCESS = "没有运行时的任务实例";
+
+
+    /**
      * 操作失败
      */
     public static final String ERROR = "操作失败";
+    /**
+     * 操作失败
+     */
+    public static final String PROCESS_WAS_END = "当前任务已经结束";
 
     /**
      * 未查询到相关数据
      */
     public static final String NO_DATA = "未查询到相关数据";
-
+    /**
+     * 未查询到相关数据
+     */
+    public static final String PROCESS_START_ERROR = "启动流程失败";
     /**
      * 请求数据不合法
      */
     public static final String DATA_ILLEGAL = "请求数据不合法";
+
+
+
 }

jyzb-process/src/main/java/com/junmp/junmpProcess/controller/BpmnController.java

@@ -10,7 +10,6 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.junmp.junmpProcess.common.R;
 import com.junmp.junmpProcess.common.Result;
-import com.junmp.junmpProcess.doc.BpmnDoc;
 import com.junmp.junmpProcess.dto.ApplyDTO;
 import com.junmp.junmpProcess.dto.HandleDataDTO;
 import com.junmp.junmpProcess.dto.StartProcessInstanceDTO;
@@ -21,10 +20,10 @@ import com.junmp.junmpProcess.entity.ProcessTemplates;
 import com.junmp.junmpProcess.exception.WorkFlowException;
 import com.junmp.junmpProcess.service.Repository.ProcessTemplateService;
 import com.junmp.junmpProcess.utils.BpmnConvert;
-import com.junmp.junmpProcess.vo.HistoryProcessInstanceVO;
-import com.junmp.junmpProcess.vo.ProcessVO;
-import com.junmp.junmpProcess.vo.TaskVO;
-import com.junmp.junmpProcess.vo.UpdateProcessVO;
+import com.junmp.junmpProcess.vo.*;
+import com.junmp.jyzb.utils.HttpStatus;
+import com.junmp.jyzb.utils.ResponseResult;
+import com.junmp.jyzb.utils.ReturnMsg;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.SneakyThrows;
@@ -56,17 +55,17 @@ import java.util.Map;
 @RestController
 @RequestMapping("/Process")
 @Api(tags = "流程表单方法")
-public class BpmnController implements BpmnDoc {
+public class BpmnController  {
 
     @Autowired
     private ProcessTemplateService processTemplateService;
     @Autowired
     private WorkProcessService WorkProcessService;
-    @Override
+
     @ApiOperation("创建流程和表单")
     @PostMapping(value = "create")
 
-    public Result<String> create(@RequestBody ProcessVO processVO) throws JsonProcessingException {
+    public ResponseResult create(@RequestBody ProcessVO processVO) throws JsonProcessingException {
         return WorkProcessService.createBpmn(processVO);
 
     }
@@ -75,35 +74,44 @@ public class BpmnController implements BpmnDoc {
      */
     @ApiOperation("修改表单")
     @PutMapping("updateForm")
-    public Object updateForm(@RequestBody UpdateProcessVO process) throws JsonProcessingException {
+    public ResponseResult updateForm(@RequestBody UpdateProcessVO process) throws JsonProcessingException {
         return WorkProcessService.updateForm(process);
     }
+    /**
+     * 编辑表单
+     */
+    @ApiOperation("轉交")
+    @PutMapping("turn")
+    public ResponseResult turn(@RequestBody TurnVo turns) {
+        return WorkProcessService.turn(turns);
+    }
 
     @ApiOperation("通过流程定义id启动流程")
     @PostMapping("start")
-    public Result<Object> start(@RequestBody StartProcessInstanceDTO startProcessInstanceDTO) {
+    public ResponseResult start(@RequestBody StartProcessInstanceDTO startProcessInstanceDTO) {
         return WorkProcessService.start(startProcessInstanceDTO);
     }
     @ApiOperation("查看我发起的流程")
     @PostMapping("applyList")
-    public Result<Page<HistoryProcessInstanceVO>> applyList(@RequestBody ApplyDTO ApplyDTO) {
+    public ResponseResult applyList(@RequestBody ApplyDTO ApplyDTO) {
         return WorkProcessService.applyList(ApplyDTO);
     }
 
     @ApiOperation("查看我的待办")
     @PostMapping("toDoList")
-    public Result<Page<TaskVO>> toDoList(@RequestBody TaskDTO taskDTO){
+    public ResponseResult toDoList(@RequestBody TaskDTO taskDTO){
         return WorkProcessService.toDoList(taskDTO);
     }
     @ApiOperation("同意按钮")
     @PostMapping("agree")
-    public Result<Page<TaskVO>> agree(@RequestBody HandleDataDTO handleDataDTO){
+    public ResponseResult agree(@RequestBody HandleDataDTO handleDataDTO){
         return WorkProcessService.agree(handleDataDTO);
     }
     @ApiOperation("拒绝按钮")
     @PostMapping("refuse")
-    public Result<Page<TaskVO>> refuse(@RequestBody HandleDataDTO handleDataDTO){
+    public ResponseResult refuse(@RequestBody HandleDataDTO handleDataDTO){
         return WorkProcessService.refuse(handleDataDTO);
+
     }
     /**
      * 查询表单模板数据
@@ -113,10 +121,10 @@ public class BpmnController implements BpmnDoc {
      */
     @ApiOperation("根据ID获取表单信息")
     @PostMapping(value = "getFormTemplateById")
-    public Object getFormTemplateById(String templateId) {
+    public ResponseResult getFormTemplateById(String templateId) {
         ProcessTemplates processTemplates = processTemplateService.getById(templateId);
         processTemplates.setFormId(processTemplates.getTemplateId());
-        return R.ok(processTemplates);
+        return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS,processTemplates);
     }
 
     /**
@@ -125,8 +133,8 @@ public class BpmnController implements BpmnDoc {
      * @return 模板详情数据
      */
     @ApiOperation("获取全部可用的表单和审核流")
-    @PostMapping(value = "getFormList")
-    public Object getFormList( ) {
+    @GetMapping(value = "getFormList")
+    public ResponseResult getFormList( ) {
         return WorkProcessService.getFormList();
     }
 
@@ -138,10 +146,7 @@ public class BpmnController implements BpmnDoc {
      */
     @ApiOperation("通过模板id查看流程信息")
     @GetMapping("getFormDetail")
-    public Result<ProcessTemplates> getFormDetail(@RequestParam("templateId") String templateId){
+    public ResponseResult getFormDetail(@RequestParam("templateId") String templateId){
         return WorkProcessService.getFormDetail(templateId);
     }
-
-
-
 }

jyzb-process/src/main/java/com/junmp/junmpProcess/doc/BpmnDoc.java

-package com.junmp.junmpProcess.doc;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.junmp.junmpProcess.common.Result;
-import com.junmp.junmpProcess.vo.ProcessVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-@Api(value = "bpmn接口", tags = "bpmn接口")
-public interface BpmnDoc {
-
-    /**
-     * bpmn划线
-     */
-    @ApiOperation(value = "bpmn划线", tags = "bpmn划线")
-    Result<String> create(ProcessVO processVO) throws JsonProcessingException;
-}

jyzb-process/src/main/java/com/junmp/junmpProcess/service/Bussiness/WorkProcessService.java

@@ -10,6 +10,7 @@ import com.junmp.junmpProcess.dto.StartProcessInstanceDTO;
 import com.junmp.junmpProcess.dto.TaskDTO;
 import com.junmp.junmpProcess.entity.ProcessTemplates;
 import com.junmp.junmpProcess.vo.*;
+import com.junmp.jyzb.utils.ResponseResult;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
@@ -22,13 +23,14 @@ public interface WorkProcessService {
      *
      * @return
      */
-    Result<String> createBpmn(ProcessVO processVO) throws JsonProcessingException;
+    ResponseResult createBpmn(ProcessVO processVO) throws JsonProcessingException;
     /**
      * 编辑表单
      *
      * @return
      */
-    Object updateForm(UpdateProcessVO process) throws JsonProcessingException;
+    ResponseResult updateForm(UpdateProcessVO process) throws JsonProcessingException;
+    ResponseResult turn(TurnVo turns);
 
     /**
     * @Author: Zhaojw
@@ -37,14 +39,14 @@ public interface WorkProcessService {
     * @Params:
     * @Return
     */
-    Result<ProcessTemplates> getFormDetail(String templateId);
+    ResponseResult getFormDetail(String templateId);
 
     /**
      * 获取用户可见表单
      *
      * @return
      */
-    Object getFormList();
+    ResponseResult getFormList();
 
 
     /**
@@ -59,21 +61,21 @@ public interface WorkProcessService {
      *
      * @return
      */
-    Result<Object> start(StartProcessInstanceDTO startProcessInstanceDTO);
+    ResponseResult start(StartProcessInstanceDTO startProcessInstanceDTO);
 
     /**
      * 查看我发起的流程
      *
      * @return
      */
-    Result<Page<HistoryProcessInstanceVO>> applyList(ApplyDTO applyDTO);
+    ResponseResult applyList(ApplyDTO applyDTO);
 
     /**
      * 查看我的待办
      *
      * @return
      */
-    Result<Page<TaskVO>> toDoList(TaskDTO taskDTO);
+    ResponseResult toDoList(TaskDTO taskDTO);
 
     /**
      * 查看我的已办
@@ -87,7 +89,7 @@ public interface WorkProcessService {
      *
      * @return
      */
-    Result agree(HandleDataDTO handleDataDTO);
+    ResponseResult agree(HandleDataDTO handleDataDTO);
 
     /**
      * 委派
@@ -108,7 +110,7 @@ public interface WorkProcessService {
      *
      * @return
      */
-    Result refuse(HandleDataDTO handleDataDTO);
+    ResponseResult refuse(HandleDataDTO handleDataDTO);
 
     /**
      * 撤销按钮

jyzb-process/src/main/java/com/junmp/junmpProcess/utils/BpmnConvert.java

@@ -9,7 +9,9 @@ import org.flowable.bpmn.BpmnAutoLayout;
 import org.flowable.bpmn.converter.BpmnXMLConverter;
 import org.flowable.bpmn.model.*;
 import org.flowable.bpmn.model.Process;
+import org.flowable.engine.TaskService;
 import org.flowable.engine.delegate.ExecutionListener;
+import org.flowable.task.service.impl.persistence.entity.TaskEntity;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import javax.annotation.Resource;

jyzb-process/src/main/java/com/junmp/junmpProcess/vo/TemplateGroupVo.java

@@ -18,10 +18,6 @@ import java.util.List;
 @AllArgsConstructor
 public class TemplateGroupVo {
 
-    private Integer id;
-
-    private String name;
-
     private List<Template> items;
 
     @Data
@@ -32,19 +28,9 @@ public class TemplateGroupVo {
 
         private String formId;
         private String processDefinitionId;
-        private Integer tgId;
-
         private String formName;
-
-        private String icon;
-
         private Boolean isStop;
-
         private String remark;
-        private JSONObject logo;
-
-        private String background;
-
         private String updated;
         private String templateId;
     }

jyzb-process/src/main/java/com/junmp/junmpProcess/vo/TurnVo.java

+package com.junmp.junmpProcess.vo;
+
+import lombok.Data;
+
+
+@Data
+public class TurnVo {
+    private String taskId;
+    private String userId;
+    private String[] assigneeList;
+}
+