调整审核流

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

@@ -119,7 +119,8 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
         {
             StartProcessInstanceDTO startProcessInstanceDTO=new StartProcessInstanceDTO();
             startProcessInstanceDTO.setProcessDefinitionId(req.getProcessDefinitionId());
-            WorkProcessService.start(startProcessInstanceDTO);
+            String ProcessInstanceId= WorkProcessService.start(startProcessInstanceDTO);
+            order.setProcessId(ProcessInstanceId);
         }
         orderDetailService.saveBatch(detailList);
        //设置总价格和总数量

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

@@ -101,8 +101,9 @@ public class BpmnController  {
     }
     @ApiOperation("通过流程定义id启动流程")
     @PostMapping("start")
-    public ApiRes<Boolean> start(@RequestBody StartProcessInstanceDTO startProcessInstanceDTO) {
-        return WorkProcessService.start(startProcessInstanceDTO);
+    public ApiRes<String> start(@RequestBody StartProcessInstanceDTO startProcessInstanceDTO) {
+
+        return ApiRes.success(WorkProcessService.start(startProcessInstanceDTO));
     }
     @ApiOperation("通过流程实例查看审批记录")
     @PostMapping("record")

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

@@ -10,7 +10,7 @@ import lombok.Data;
 @Data
 public class UserInfo {
     private String id;
-    private String userId;
+    private Long userId;
     private String name;
     private String type;
     private String sex;

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

@@ -97,7 +97,7 @@ public interface WorkProcessService {
      *
      * @return
      */
-    ApiRes<Boolean> start(StartProcessInstanceDTO startProcessInstanceDTO);
+    String start(StartProcessInstanceDTO startProcessInstanceDTO);
 
     /**
      * 通过流程定义id启动流程

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

@@ -637,13 +637,13 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
      * @return
      */
     @Override
-    public ApiRes<Boolean> start(StartProcessInstanceDTO processInstanceDto) {
+    public String start(StartProcessInstanceDTO processInstanceDto) {
         try {
 
             LoginUser StartUser=new LoginUser();
-            StartUser.setUserId(Long.valueOf("1694954953210986498"));
+//            StartUser.setUserId(Long.valueOf("1694954953210986498"));
 
-//            StartUser= LoginContext.getContext().getLoginUser();
+            StartUser= LoginContext.getContext().getLoginUser();
 
             JSONObject formData = processInstanceDto.getFormData();
             Authentication.setAuthenticatedUserId(StartUser.getUserId().toString());
@@ -684,18 +684,18 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
 //                taskService.complete(task.getId());
 //
 //            }
-            return  ApiRes.success(true);
+            return  processInstance.getProcessInstanceId();
         }
         catch (Exception e){
             Throwable cause = e.getCause();
             if(cause instanceof WorkFlowException){
                 WorkFlowException workFlowException=(WorkFlowException)cause;
-                return  ApiRes.failure(workFlowException.getMessage());
+                return  workFlowException.getMessage();
 
 
             }
             e.printStackTrace();
-            return  ApiRes.failure("流程不存在或已挂起");
+            return  "流程不存在或已挂起";
         }
     }
 
@@ -779,7 +779,15 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
      */
     @Override
     public PageResult<HistoryProcessInstanceVO>  applyList(ApplyDTO applyDTO) {
-        LoginUser StartUser= LoginContext.getContext().getLoginUser();
+        LoginUser StartUser=new LoginUser();
+        if (applyDTO.getCurrentUserInfo().getUserId()!=null)//优先拿接口中的信息，方便调试
+        {
+            StartUser.setUserId(applyDTO.getCurrentUserInfo().getUserId());
+        }
+        else
+        {
+            StartUser= LoginContext.getContext().getLoginUser();
+        }
         PageResult<HistoryProcessInstanceVO> pageResult=new  PageResult<HistoryProcessInstanceVO>();
         List<HistoricProcessInstance> historicProcessInstances =
                 historyService.createHistoricProcessInstanceQuery()
@@ -837,15 +845,15 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
      */
     @Override
     public PageResult<TaskVO> toDoList(TaskDTO taskDTO) {
-        LoginUser StartUser=new LoginUser();
-        if (taskDTO.getCurrentUserInfo().getUserId()!=null)//优先拿接口中的信息，方便调试
-        {
-            StartUser.setUserId(taskDTO.getCurrentUserInfo().getUserId());
-        }
-        else
-        {
-            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()