|
|
@@ -3,6 +3,7 @@ package com.lc.ibps.bpmn.listener;
|
|
|
import com.lc.ibps.base.core.util.BeanUtils;
|
|
|
import com.lc.ibps.base.core.util.string.StringUtil;
|
|
|
import com.lc.ibps.bpmn.api.cmd.ActionCmd;
|
|
|
+import com.lc.ibps.bpmn.api.cmd.ProcInstCmd;
|
|
|
import com.lc.ibps.bpmn.api.cmd.TaskFinishCmd;
|
|
|
import com.lc.ibps.bpmn.api.constant.*;
|
|
|
import com.lc.ibps.bpmn.api.context.BpmnContextUtil;
|
|
|
@@ -13,7 +14,9 @@ import com.lc.ibps.bpmn.api.model.task.IBpmTask;
|
|
|
import com.lc.ibps.bpmn.api.model.task.SkipRes;
|
|
|
import com.lc.ibps.bpmn.api.nat.inst.NatProInstService;
|
|
|
import com.lc.ibps.bpmn.api.nat.task.NatTaskService;
|
|
|
+import com.lc.ibps.bpmn.api.service.BpmProcInstService;
|
|
|
import com.lc.ibps.bpmn.builder.BpmOperLogBuilder;
|
|
|
+import com.lc.ibps.bpmn.cmd.IbpsProcInstCmd;
|
|
|
import com.lc.ibps.bpmn.domain.*;
|
|
|
import com.lc.ibps.bpmn.persistence.entity.*;
|
|
|
import com.lc.ibps.bpmn.repository.*;
|
|
|
@@ -22,6 +25,7 @@ import com.lc.ibps.bpmn.utils.BpmUtil;
|
|
|
import com.lc.ibps.bpmn.utils.NotifyUtil;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.context.ApplicationListener;
|
|
|
import org.springframework.core.Ordered;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
@@ -69,6 +73,8 @@ public class TaskCompleteEventListener implements ApplicationListener<TaskComple
|
|
|
private NatProInstService natProInstService;
|
|
|
@Resource
|
|
|
private BpmInstRepository bpmInstRepository;
|
|
|
+ @Autowired
|
|
|
+ private BpmProcInstService bpmProcInstService;
|
|
|
@Resource
|
|
|
private BpmOperNotifyRepository bpmOperNotifyRepository;
|
|
|
@Resource
|
|
|
@@ -123,7 +129,7 @@ public class TaskCompleteEventListener implements ApplicationListener<TaskComple
|
|
|
updateExec(delegateTask, bpmTask, actionCmd);
|
|
|
|
|
|
// 更新流程实例
|
|
|
-// updateProcInst(cmd);
|
|
|
+ updateSubject(delegateTask,cmd);
|
|
|
|
|
|
|
|
|
// 完成转办代理任务
|
|
|
@@ -584,4 +590,17 @@ public class TaskCompleteEventListener implements ApplicationListener<TaskComple
|
|
|
bpmTaskAssignDomain.delByTask(taskId);
|
|
|
bpmTaskDomain.delete(taskId);
|
|
|
}
|
|
|
+
|
|
|
+ private void updateSubject(BpmDelegateTask delegateTask, TaskFinishCmd cmd) {
|
|
|
+
|
|
|
+ String procInstId=String.valueOf(delegateTask.getVariable(BpmConstants.PROCESS_INST_ID));
|
|
|
+ BpmInstPo instance= bpmInstRepository.get(procInstId);
|
|
|
+
|
|
|
+ ProcInstCmd procInstCmd = new IbpsProcInstCmd() ;
|
|
|
+ procInstCmd.setBusData(cmd.getBusData());
|
|
|
+ procInstCmd.setCurUserName(cmd.getCurUserName());
|
|
|
+ procInstCmd.setBusinessKey(cmd.getBusinessKey());
|
|
|
+ ((IbpsProcInstCmd) procInstCmd).setVariables(cmd.getVariables());
|
|
|
+ bpmProcInstService.saveSubject(instance,procInstCmd);
|
|
|
+ }
|
|
|
}
|