1

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;
 
     //订单编号
@@ -86,3 +88,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;
 import lombok.Data;
@@ -27,9 +29,13 @@ public class UpdateOrderReq extends BaseRequest implements Serializable {
      * 工作流ID
      */
     private String  processDefinitionId;
+
+
+
     /**
      * 单据业务类型
      */
+//    @IsDateTime(format = "yyyy-MM-dd HH:mm:ss", message = "字段必须是有效的日期或时间")
     private String  bussinessType;
     /**
      * 订单号

jyzb-process/src/main/java/com/junmp/junmpProcess/config/FlowableGlobListenerConfig.java → jyzb-biz/src/main/java/com/junmp/jyzb/config/FlowableGlobListenerConfig.java

-package com.junmp.junmpProcess.config;
+package com.junmp.jyzb.config;
 
-import com.junmp.junmpProcess.listener.GlobalEndListener;
+
+import com.junmp.jyzb.listener.GlobalEndListener;
 import org.flowable.common.engine.api.delegate.event.FlowableEngineEventType;
 import org.flowable.common.engine.api.delegate.event.FlowableEventDispatcher;
 import org.flowable.spring.SpringProcessEngineConfiguration;
@@ -9,10 +10,13 @@ import org.springframework.context.ApplicationListener;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.event.ContextRefreshedEvent;
 
+import javax.annotation.Resource;
+
 @Configuration
 public class FlowableGlobListenerConfig implements ApplicationListener<ContextRefreshedEvent> {
     @Autowired
     private SpringProcessEngineConfiguration configuration;
+    @Resource
     @Autowired
     private GlobalEndListener endListener;
 

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

-package com.junmp.junmpProcess.listener;
+package com.junmp.jyzb.listener;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.map.MapUtil;
@@ -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/listener/GlobalEndListener.java → jyzb-biz/src/main/java/com/junmp/jyzb/listener/GlobalEndListener.java

-package com.junmp.junmpProcess.listener;
+package com.junmp.jyzb.listener;
 
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
@@ -41,22 +41,25 @@ import java.util.Map;
 
                 // 获取流程实例关联的变量
                 Map<String, Object> processVariables = getProcessVariables(processInstanceId);
-
-                // 获取单据类型
-                String documentType = (String) processVariables.get("documentType");
-                UpdateOrderReq updateOrderReq = JSONObject.parseObject(documentType, new TypeReference<UpdateOrderReq>() {
-                });
-                // 获取单据类型
-                String orderReq = (String) processVariables.get("orderReq");
-                // 根据单据类型执行不同的操作
-                if ("equipment".equals(documentType)) {
-                    // 执行装备相关操作,防止循环应用，丢入消息队列
+                if (processVariables!=null)
+                {
+                    // 获取单据类型
+                    String documentType = (String) processVariables.get("documentType");
+                    UpdateOrderReq updateOrderReq = JSONObject.parseObject(documentType, new TypeReference<UpdateOrderReq>() {
+                    });
+                    // 获取单据类型
+                    String orderReq = (String) processVariables.get("orderReq");
+                    // 根据单据类型执行不同的操作
+                    if ("equipment".equals(documentType)) {
+                        // 执行装备相关操作,防止循环应用，丢入消息队列
 //                    orderMainService.AddOrder(updateOrderReq);
-                } else if ("personnel".equals(documentType)) {
-                    // 执行人员相关操作
-                    // ...
+                    } else if ("personnel".equals(documentType)) {
+                        // 执行人员相关操作
+                        // ...
+                    }
                 }
 
+
             }
         }
 

jyzb-process/src/main/java/com/junmp/junmpProcess/listener/ProcessListener.java → jyzb-biz/src/main/java/com/junmp/jyzb/listener/ProcessListener.java

-package com.junmp.junmpProcess.listener;
+package com.junmp.jyzb.listener;
 
 import org.flowable.engine.RepositoryService;
 import org.flowable.engine.delegate.DelegateExecution;

jyzb-process/src/main/java/com/junmp/junmpProcess/listener/ServiceListener.java → jyzb-biz/src/main/java/com/junmp/jyzb/listener/ServiceListener.java

-package com.junmp.junmpProcess.listener;
+package com.junmp.jyzb.listener;
 
 import org.flowable.engine.RepositoryService;
 import org.flowable.engine.delegate.DelegateExecution;

jyzb-process/src/main/java/com/junmp/junmpProcess/listener/TaskCreatedListener.java → jyzb-biz/src/main/java/com/junmp/jyzb/listener/TaskCreatedListener.java

-package com.junmp.junmpProcess.listener;
+package com.junmp.jyzb.listener;
 
 import org.flowable.engine.RepositoryService;
 import org.flowable.engine.RuntimeService;

jyzb-process/src/main/java/com/junmp/junmpProcess/listener/TimerListener.java → jyzb-biz/src/main/java/com/junmp/jyzb/listener/TimerListener.java

-package com.junmp.junmpProcess.listener;
+package com.junmp.jyzb.listener;
 
 import lombok.extern.slf4j.Slf4j;
 import org.flowable.engine.RepositoryService;

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

@@ -21,6 +21,7 @@ import com.junmp.junmpProcess.service.Bussiness.WorkProcessService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 import java.util.Map;
 
 
@@ -46,7 +47,7 @@ public class BpmnController  {
      * 修改表单
      */
     @ApiOperation("修改表单")
-    @PutMapping("updateForm")
+    @PostMapping("updateForm")
     public ApiRes<Boolean> updateForm(@RequestBody UpdateProcessVO process) throws JsonProcessingException {
         return ApiRes.success(WorkProcessService.updateForm(process));
     }
@@ -103,6 +104,12 @@ public class BpmnController  {
     public ApiRes<Boolean> start(@RequestBody StartProcessInstanceDTO startProcessInstanceDTO) {
         return WorkProcessService.start(startProcessInstanceDTO);
     }
+    @ApiOperation("通过流程实例查看审批记录")
+    @PostMapping("record")
+    public ApiRes<List<TaskDetailVO>> record(@RequestBody HandleDataDTO handleDataDTO) {
+
+        return WorkProcessService.record(handleDataDTO.getProcessInstanceId());
+    }
     @ApiOperation("通过流程定义查看详情")
     @PostMapping("instanceInfo")
     public ApiRes<HandleDataVO> instanceInfo(@RequestBody HandleDataDTO handleDataDTO) {

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/service/Bussiness/WorkProcessService.java

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