工作流自测

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/OrderMainDto.java

@@ -16,6 +16,8 @@ public class OrderMainDto implements Serializable {
     private String processId;
 
     //单据类型（入库类型）
+    private String processInfo;
+    //单据类型（入库类型）
     private String bussinessType;
 
     //订单编号
@@ -81,3 +83,4 @@ public class OrderMainDto implements Serializable {
     private String attachmentLocation;
 
 }
+

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateOrderReq.java

 package com.junmp.jyzb.api.bean.req;
 
+
 import com.junmp.jyzb.api.bean.Validator.IsDateTime;
 import com.junmp.jyzb.api.bean.Validator.IsNumber;
 import com.junmp.v2.common.bean.request.BaseRequest;
@@ -28,6 +29,9 @@ public class UpdateOrderReq extends BaseRequest implements Serializable {
      * 工作流ID
      */
     private String  processDefinitionId;
+
+
+
     /**
      * 单据业务类型
      */

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/OrderMainServiceImpl.java

@@ -116,7 +116,9 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
         if (req.getExamineState().equals("working"))
         {
             StartProcessInstanceDTO startProcessInstanceDTO=new StartProcessInstanceDTO();
+
             startProcessInstanceDTO.setProcessDefinitionId(req.getProcessDefinitionId());
+
             ApiRes<Boolean> startRes=  WorkProcessService.start(startProcessInstanceDTO);
             if (startRes.getMessage()!="ok")
             {

jyzb-process/src/main/java/com/junmp/junmpProcess/dto/HandleDataDTO.java

@@ -8,10 +8,7 @@ import com.junmp.junmpProcess.dto.json.UserInfo;
 
 import java.util.List;
 
-/**
- * @author LoveMyOrange
- * @create 2022-10-15 16:27
- */
+
 @Data
 @ApiModel("各个按钮 处理数据需要传递的参数")
 public class HandleDataDTO {

jyzb-process/src/main/java/com/junmp/junmpProcess/dto/StartProcessInstanceDTO.java

@@ -2,6 +2,7 @@ package com.junmp.junmpProcess.dto;
 
 import com.alibaba.fastjson.JSONObject;
 import com.junmp.junmpProcess.dto.json.JunmpUserInfo;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import com.junmp.junmpProcess.dto.json.UserInfo;
 

jyzb-process/src/main/java/com/junmp/junmpProcess/dto/json/JunmpUserInfo.java

@@ -4,7 +4,7 @@ import lombok.Data;
 
 @Data
 public class JunmpUserInfo {
-    private String userId;
+    private Long userId;
     private String sex;
     private String name;
 }

jyzb-process/src/main/java/com/junmp/junmpProcess/listener/CounterSignListener.java

@@ -67,7 +67,7 @@ public class CounterSignListener implements ExecutionListener {
             }
             ApproverGroups group=currentNode.getApproverGroups().get(0);
             String Type=group.getApproverType();
-            if (Type.equals("1"))//指定人员，不处理
+            if (Type.equals("1")||Type.equals("8"))//指定人员，不处理
             {
 
                 List<String> assignedUser = group.getApproverIds();

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

@@ -405,7 +405,7 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
         }
         else
         {
-            formName =processTemplates.getFormName();
+            formName = processTemplates.getFormName();
         }
 //        processTemplates.setFormJson(formJsonNode.toString());//暂时用不到，以后会用
 
@@ -664,11 +664,12 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
     @Override
     public ApiRes<Boolean> start(StartProcessInstanceDTO processInstanceDto) {
         try {
+
             LoginUser StartUser=new LoginUser();
-            long use=1000;
-            StartUser.setUserId(use);
+            StartUser.setUserId(Long.valueOf(1000));
 
-//            LoginUser StartUser= LoginContext.getContext().getLoginUser();
+//            StartUser= LoginContext.getContext().getLoginUser();
+//
             JSONObject formData = processInstanceDto.getFormData();
             Authentication.setAuthenticatedUserId(StartUser.getUserId().toString());
             Map<String,Object> processVariables= new HashMap<>();
@@ -702,12 +703,12 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
                     .businessStatus(BUSINESS_STATUS_1)
                         .start();
                         //手动完成第一个任务
-//            Task task = taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
-//            Object ts=new Object();
-//            if(task!=null){
-//                taskService.complete(task.getId());
-//
-//            }
+            Task task = taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+            Object ts=new Object();
+            if(task!=null){
+                taskService.complete(task.getId());
+
+            }
             return  ApiRes.success(true);
         }
         catch (Exception e){
@@ -788,7 +789,16 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
      */
     @Override
     public PageResult<TaskVO> toDoList(TaskDTO taskDTO) {
-        LoginUser StartUser= LoginContext.getContext().getLoginUser();
+        LoginUser StartUser=new LoginUser();
+        if (taskDTO.getCurrentUserInfo().getUserId()!=null)//优先拿接口中的信息，方便调试
+        {
+            StartUser.setUserId(taskDTO.getCurrentUserInfo().getUserId());
+        }
+        else
+        {
+            StartUser= LoginContext.getContext().getLoginUser();
+        }
+
         List<Task> tasks = taskService.createTaskQuery().taskAssignee(StartUser.getUserId().toString())
                 .includeProcessVariables()
                 .orderByTaskCreateTime().desc()
@@ -833,7 +843,17 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
      */
     @Override
     public PageResult<TaskVO> doneList(TaskDTO taskDTO) {
-        LoginUser StartUser= LoginContext.getContext().getLoginUser();
+        LoginUser StartUser=new LoginUser();
+        if (taskDTO.getCurrentUserInfo().getUserId()!=null)//优先拿接口中的信息，方便调试
+        {
+            StartUser.setUserId(taskDTO.getCurrentUserInfo().getUserId());
+        }
+        else
+        {
+            StartUser= LoginContext.getContext().getLoginUser();
+        }
+
+
         List<HistoricTaskInstance> tasks = historyService.createHistoricTaskInstanceQuery()
                 .taskAssignee(StartUser.getUserId().toString())
                 .finished()
@@ -885,8 +905,15 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
 
     @Override
     public ResponseResult revoke(HandleDataDTO handleDataDTO) {
-        LoginUser StartUser= LoginContext.getContext().getLoginUser();
-//        UserInfo currentUserInfo = handleDataDTO.getCurrentUserInfo();
+        LoginUser StartUser=new LoginUser();
+        if (handleDataDTO.getCurrentUserInfo().getUserId()!=null)//优先拿接口中的信息，方便调试
+        {
+            StartUser.setUserId(Long.valueOf(handleDataDTO.getCurrentUserInfo().getUserId()));
+        }
+        else
+        {
+            StartUser= LoginContext.getContext().getLoginUser();
+        }
         Authentication.setAuthenticatedUserId(StartUser.getUserId().toString());
         List<AttachmentDTO> attachments = handleDataDTO.getAttachments();
         String comments = handleDataDTO.getComments();
@@ -919,8 +946,16 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
     }
     @Override
     public ResponseResult agree(HandleDataDTO handleDataDTO) {
-        LoginUser StartUser= LoginContext.getContext().getLoginUser();
 
+        LoginUser StartUser=new LoginUser();
+        if (handleDataDTO.getCurrentUserInfo().getUserId()!=null)//优先拿接口中的信息，方便调试
+        {
+            StartUser.setUserId(Long.valueOf(handleDataDTO.getCurrentUserInfo().getUserId()));
+        }
+        else
+        {
+            StartUser= LoginContext.getContext().getLoginUser();
+        }
         List<AttachmentDTO> attachments = handleDataDTO.getAttachments();
         String comments = handleDataDTO.getComments();
         JSONObject formData = handleDataDTO.getFormData();
@@ -982,7 +1017,15 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
 
     @Override
     public Result delegateTask(HandleDataDTO handleDataDTO) {
-        LoginUser StartUser= LoginContext.getContext().getLoginUser();
+        LoginUser StartUser=new LoginUser();
+        if (handleDataDTO.getCurrentUserInfo().getUserId()!=null)//优先拿接口中的信息，方便调试
+        {
+            StartUser.setUserId(Long.valueOf(handleDataDTO.getCurrentUserInfo().getUserId()));
+        }
+        else
+        {
+            StartUser= LoginContext.getContext().getLoginUser();
+        }
 
         List<AttachmentDTO> attachments = handleDataDTO.getAttachments();
         String comments = handleDataDTO.getComments();
@@ -1019,7 +1062,15 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
 
     @Override
     public Result resolveTask(HandleDataDTO handleDataDTO) {
-        LoginUser StartUser= LoginContext.getContext().getLoginUser();
+        LoginUser StartUser=new LoginUser();
+        if (handleDataDTO.getCurrentUserInfo().getUserId()!=null)//优先拿接口中的信息，方便调试
+        {
+            StartUser.setUserId(Long.valueOf(handleDataDTO.getCurrentUserInfo().getUserId()));
+        }
+        else
+        {
+            StartUser= LoginContext.getContext().getLoginUser();
+        }
 
         List<AttachmentDTO> attachments = handleDataDTO.getAttachments();
         String comments = handleDataDTO.getComments();
@@ -1055,7 +1106,15 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
 
     @Override
     public ResponseResult refuse(HandleDataDTO handleDataDTO) {
-        LoginUser StartUser= LoginContext.getContext().getLoginUser();
+        LoginUser StartUser=new LoginUser();
+        if (handleDataDTO.getCurrentUserInfo().getUserId()!=null)//优先拿接口中的信息，方便调试
+        {
+            StartUser.setUserId(Long.valueOf(handleDataDTO.getCurrentUserInfo().getUserId()));
+        }
+        else
+        {
+            StartUser= LoginContext.getContext().getLoginUser();
+        }
 
         Authentication.setAuthenticatedUserId(StartUser.getUserId().toString());
         List<AttachmentDTO> attachments = handleDataDTO.getAttachments();
@@ -1127,7 +1186,15 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
 
     @Override
     public Result rollback(HandleDataDTO handleDataDTO) {
-        LoginUser StartUser= LoginContext.getContext().getLoginUser();
+        LoginUser StartUser=new LoginUser();
+        if (handleDataDTO.getCurrentUserInfo().getUserId()!=null)//优先拿接口中的信息，方便调试
+        {
+            StartUser.setUserId(Long.valueOf(handleDataDTO.getCurrentUserInfo().getUserId()));
+        }
+        else
+        {
+            StartUser= LoginContext.getContext().getLoginUser();
+        }
         Authentication.setAuthenticatedUserId(StartUser.getUserId().toString());
         List<AttachmentDTO> attachments = handleDataDTO.getAttachments();
         String comments = handleDataDTO.getComments();