fix 修改无法终止流程bug,补充注释

master
gssong 2 years ago
parent 81b2999dc4
commit fe13fd899c

@ -24,12 +24,6 @@ public class TerminationBo implements Serializable {
@NotBlank(message = "任务id为空", groups = AddGroup.class)
private String taskId;
/**
* id
*/
@NotBlank(message = "转办人不能为空", groups = AddGroup.class)
private String userId;
/**
*
*/

@ -17,7 +17,8 @@ public interface IActModelService {
/**
*
*
* @param modelBo
* @param modelBo
* @param pageQuery
* @return
*/
TableDataInfo<Model> page(ModelBo modelBo, PageQuery pageQuery);

@ -18,6 +18,7 @@ public interface IActProcessDefinitionService {
*
*
* @param processDefinitionBo
* @param pageQuery
* @return
*/
TableDataInfo<ProcessDefinitionVo> page(ProcessDefinitionBo processDefinitionBo, PageQuery pageQuery);

@ -36,6 +36,7 @@ public interface IActProcessInstanceService {
*
*
* @param processInstanceBo
* @param pageQuery
* @return
*/
TableDataInfo<ProcessInstanceVo> getPageByRunning(ProcessInstanceBo processInstanceBo, PageQuery pageQuery);
@ -44,6 +45,7 @@ public interface IActProcessInstanceService {
*
*
* @param processInstanceBo
* @param pageQuery
* @return
*/
TableDataInfo<ProcessInstanceVo> getPageByFinish(ProcessInstanceBo processInstanceBo, PageQuery pageQuery);

@ -33,7 +33,8 @@ public interface IActTaskService {
/**
*
*
* @param taskBo
* @param taskBo
* @param pageQuery
* @return
*/
TableDataInfo<TaskVo> getPageByTaskWait(TaskBo taskBo, PageQuery pageQuery);
@ -41,7 +42,8 @@ public interface IActTaskService {
/**
*
*
* @param taskBo
* @param taskBo
* @param pageQuery
* @return
*/
TableDataInfo<TaskVo> getPageByAllTaskWait(TaskBo taskBo, PageQuery pageQuery);
@ -50,7 +52,8 @@ public interface IActTaskService {
/**
*
*
* @param taskBo
* @param taskBo
* @param pageQuery
* @return
*/
TableDataInfo<TaskVo> getPageByTaskFinish(TaskBo taskBo, PageQuery pageQuery);
@ -58,7 +61,8 @@ public interface IActTaskService {
/**
*
*
* @param taskBo
* @param taskBo
* @param pageQuery
* @return
*/
TableDataInfo<TaskVo> getPageByTaskCopy(TaskBo taskBo, PageQuery pageQuery);
@ -66,7 +70,8 @@ public interface IActTaskService {
/**
*
*
* @param taskBo
* @param taskBo
* @param pageQuery
* @return
*/
TableDataInfo<TaskVo> getPageByAllTaskFinish(TaskBo taskBo, PageQuery pageQuery);

@ -473,7 +473,7 @@ public class ActTaskServiceImpl implements IActTaskService {
throw new ServiceException(FlowConstant.MESSAGE_SUSPENDED);
}
HistoricProcessInstance historicProcessInstance = QueryUtils.hisInstanceQuery()
.processInstanceBusinessKey(task.getProcessInstanceId()).singleResult();
.processInstanceId(task.getProcessInstanceId()).singleResult();
BusinessStatusEnum.checkInvalidStatus(historicProcessInstance.getBusinessStatus());
try {
if (StringUtils.isBlank(terminationBo.getComment())) {
@ -488,9 +488,9 @@ public class ActTaskServiceImpl implements IActTaskService {
if (CollectionUtil.isNotEmpty(subTasks)) {
subTasks.forEach(e -> taskService.deleteTask(e.getId()));
}
runtimeService.updateBusinessStatus(task.getProcessInstanceId(), BusinessStatusEnum.TERMINATION.getStatus());
runtimeService.deleteProcessInstance(task.getProcessInstanceId(), StrUtil.EMPTY);
}
runtimeService.updateBusinessStatus(task.getProcessInstanceId(), BusinessStatusEnum.TERMINATION.getStatus());
FlowProcessEventHandler processHandler = flowEventStrategy.getProcessHandler(historicProcessInstance.getProcessDefinitionKey());
if (processHandler != null) {
processHandler.handleProcess(historicProcessInstance.getBusinessKey(), BusinessStatusEnum.TERMINATION.getStatus(), false);

Loading…
Cancel
Save