fix 81558 法规合规评估流程-部所主管级领导审批-驳回，流程丢了

81381 法规合规评估流程-全部不涉及的数据驳回，驳回节点错误
update 法规合规评估流程.bpmn

laws-modules/src/main/java/com/jero/modules/activiti/controller/ActivitiController.java

@@ -59,6 +59,8 @@ public class ActivitiController {
     @Resource
     private HistoryService historyService;
     @Resource
+    private RuntimeService runtimeService;
+    @Resource
     private TaskService taskService;
     @Resource
     private ProcessNodeService processNodeService;
@@ -105,7 +107,7 @@ public class ActivitiController {
         map1.put("流程实例id：", processInstanceId);
         map1.put("当前活动Id：", processInstance.getActivityId());
 
-        String mainDrafter = map.get("mainDrafter").toString();
+        //String mainDrafter = map.get("mainDrafter").toString();
 
         return Result.OK(map1);
     }
@@ -173,6 +175,13 @@ public class ActivitiController {
         return Result.OK();
     }
 
+    @GetMapping("/deleteProcessInstance")
+    @ApiOperation(value = "删除流程实例", notes = "删除流程实例")
+    public Result<Object> deleteProcessInstance(@RequestParam(value = "id", required = false) String id) {
+        runtimeService.deleteProcessInstance(id,"删除");
+        return Result.OK();
+    }
+
     @GetMapping("/deleteDeployment")
     @ApiOperation(value = "删除已部署的流程定义", notes = "删除已部署的流程定义")
     public Result<Object> deleteDeployment(@RequestParam(value = "id", required = false) String id) {

laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java

@@ -128,7 +128,7 @@ public class MyGlobalEventListener implements ActivitiEventListener {
         wrapper.eq(ProcessNode::getNodeName,name);
         wrapper.eq(ProcessNode::getIsView, YesOrNoEnum.YES.getValue());
         int count = processNodeService.count(wrapper);
-        if (count == 0){
+        if (count == 0 || "123".equals(assignee)){
             return;
         }
         //新增待审批记录

laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/common/ProcessProjectAssessCommon.java

@@ -12,6 +12,7 @@ public class ProcessProjectAssessCommon {
     public static final String DESIGN_ENGINEER_LIST = "designEngineerList";
     public static final String DESIGN_ENGINEER_LIST_SIZE = "designEngineerListSize";
     public static final String PASS = "pass";
+    public static final String SKIP = "skip";
     public static final String EXECUTION_ID = "executionId";
     //法规工程师发起
     public static final String FGGCSFQ = "fggcsfq";

laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java

@@ -911,5 +911,15 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
         String parentExecutionId = (String) ThreadLocalUtil.get(ProcessProjectAssessCommon.EXECUTION_ID);
         //delegateTask.setVariableLocal(ProcessProjectAssessCommon.EXECUTION_ID,parentExecutionId);
         delegateTask.setFormKey(parentExecutionId);
+        if ("123".equals(delegateTask.getAssignee())) {
+            runtimeService.setVariable(delegateTask.getExecutionId(),ProcessProjectAssessCommon.SKIP,true);
+            if (!delegateTask.getName().contains("自动")) {
+                Map<String, Object> variables = new HashMap<>();
+                variables.put(ProcessProjectAssessCommon.SKIP, true);
+                taskService.complete(delegateTask.getId(), variables);
+            }
+        }else {
+            runtimeService.setVariable(delegateTask.getExecutionId(),ProcessProjectAssessCommon.SKIP,false);
+        }
     }
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java

@@ -522,6 +522,12 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
                     .filter(Objects::nonNull)
                     .distinct()
                     .collect(Collectors.toList());
+            if (notInvolvedModuleOwnerList.size() == 0){
+                notInvolvedModuleOwnerList.add("123");
+            }
+            if (moduleOwnerList.size() == 0){
+                moduleOwnerList.add("123");
+            }
             variables.put(ProcessProjectStandardCommon.NOT_INVOLVED_MODULE_OWNER_LIST, notInvolvedModuleOwnerList);
             variables.put(ProcessProjectStandardCommon.NOT_INVOLVED_MODULE_OWNER_LIST_SIZE, notInvolvedModuleOwnerList.size());
             variables.put(ProcessProjectStandardCommon.MODULE_OWNER_LIST, moduleOwnerList);