修改产品报废、任务结束脚本逻辑

zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/service/impl/runbpm/mes/ExceptionProductObsolescence.java

@@ -5,6 +5,7 @@ import com.zkqy.execution.produce.dispersed.entity.CommonEntity;
 import com.zkqy.execution.produce.dispersed.entity.runbpm.BpmRunNodeFormFilterConditionsVo;
 import com.zkqy.execution.produce.dispersed.entity.runbpm.BpmRunNodeFromVo;
 import com.zkqy.execution.produce.dispersed.entity.runbpm.IRunBPMEntity;
+import com.zkqy.execution.produce.dispersed.mapper.BpmExecuteProcessMapper;
 import com.zkqy.execution.produce.dispersed.service.IRunBPMService;
 import com.zkqy.execution.produce.utils.EchoNodeFormData;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,6 +26,9 @@ public class ExceptionProductObsolescence implements IRunBPMService {
     @Autowired
     private EchoNodeFormData echoNodeFormData;
 
+    @Autowired // 执行流程
+    private BpmExecuteProcessMapper runBpmExecuteProcessMapper;
+
     @Override
     public CommonEntity getNodeFormData(BpmRunNodeFromVo bpmRunNodeFromVo) {
         Map<String,Object> map1 = new HashMap<>();
@@ -39,6 +43,8 @@ public class ExceptionProductObsolescence implements IRunBPMService {
 
     @Override
     public AjaxResult executeNode(IRunBPMEntity iRunBPMEntity) {
+        // 更改任务流程状态
+        runBpmExecuteProcessMapper.endProcess(iRunBPMEntity.getExecutionFlowKey());
         return AjaxResult.success();
     }
 

zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/service/impl/runbpm/mes/ExceptionTaskTermination.java

@@ -1,10 +1,13 @@
 package com.zkqy.execution.produce.dispersed.service.impl.runbpm.mes;
 
 import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.execution.produce.dispersed.entity.BpmExecuteNode;
 import com.zkqy.execution.produce.dispersed.entity.CommonEntity;
 import com.zkqy.execution.produce.dispersed.entity.runbpm.BpmRunNodeFormFilterConditionsVo;
 import com.zkqy.execution.produce.dispersed.entity.runbpm.BpmRunNodeFromVo;
 import com.zkqy.execution.produce.dispersed.entity.runbpm.IRunBPMEntity;
+import com.zkqy.execution.produce.dispersed.mapper.BpmExecuteNodeMapper;
+import com.zkqy.execution.produce.dispersed.mapper.BpmExecuteProcessMapper;
 import com.zkqy.execution.produce.dispersed.service.IRunBPMService;
 import com.zkqy.execution.produce.utils.EchoNodeFormData;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,6 +28,12 @@ public class ExceptionTaskTermination implements IRunBPMService {
     @Autowired
     private EchoNodeFormData echoNodeFormData;
 
+    @Autowired // 执行流程
+    private BpmExecuteProcessMapper runBpmExecuteProcessMapper;
+
+//    @Autowired  // 执行流程节点表
+//    private BpmExecuteNodeMapper runBpmExecuteNodeMapper;
+
     @Override
     public CommonEntity getNodeFormData(BpmRunNodeFromVo bpmRunNodeFromVo) {
         Map<String,Object> map1 = new HashMap<>();
@@ -39,6 +48,13 @@ public class ExceptionTaskTermination implements IRunBPMService {
 
     @Override
     public AjaxResult executeNode(IRunBPMEntity iRunBPMEntity) {
+        // 更改任务流程状态
+        runBpmExecuteProcessMapper.endProcess(iRunBPMEntity.getExecutionFlowKey());
+        // 更改节点任务状态
+//        BpmExecuteNode bpmExecuteNode = new BpmExecuteNode();
+//        bpmExecuteNode.setTaskProcessKey(iRunBPMEntity.getExecutionFlowKey());
+//        bpmExecuteNode.setTaskNodeType(iRunBPMEntity.getExecutionNodeKey());
+//        runBpmExecuteNodeMapper.updateNodeState(bpmExecuteNode);
         return AjaxResult.success();
     }