Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/business/service/impl/FlowBusinessServiceImpl.java

@@ -24,6 +24,7 @@
import com.vci.ubcs.flow.engine.constant.FlowEngineConstant;
import com.vci.ubcs.flow.engine.entity.FlowProcess;
import com.vci.ubcs.flow.engine.utils.FlowCache;
import com.vci.ubcs.flow.engine.utils.FlowableUtils;
import com.vci.ubcs.starter.web.util.VciDateUtil;
import com.vci.ubcs.system.user.cache.UserCache;
import com.vci.ubcs.system.user.entity.User;
@@ -40,6 +41,7 @@
import org.flowable.task.api.TaskQuery;
import org.flowable.task.api.history.HistoricTaskInstance;
import org.flowable.task.api.history.HistoricTaskInstanceQuery;
import org.flowable.variable.api.history.HistoricVariableInstance;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.Func;
@@ -182,8 +184,13 @@
         }
         flow.setStatus(FlowEngineConstant.STATUS_FINISH);

         //流程发起时间
         flow.setProcessDefinitionStartTime(VciDateUtil.date2Str(historicProcessInstance.getStartTime(),VciDateUtil.DateTimeFormat));

         //流程变量
         Map<String,Object> variables = historicProcessInstance.getProcessVariables();

         List<HistoricVariableInstance> variableInstances = historyService.createHistoricVariableInstanceQuery().processInstanceId(historicProcessInstance.getId()).list();
         Map<String,Object> variables = FlowableUtils.switchVariable(variableInstances);
         flow.setVariables(variables);

         //businessKey
@@ -287,18 +294,6 @@
      // 完成任务
      taskService.complete(taskId, variables);

//      //设置下一步审核人
//      Task task = taskService.createTaskQuery().processInstanceId(processInstanceId).active().singleResult();//下一步节点
//      String taskKey = task.getTaskDefinitionKey();//就是流程配置的节点id
//      Object to = getVar(processInstanceId,taskKey);
//      if(to==null){
//         throw new ServiceException(taskKey+"没有设置审核人");
//      }
//      String assignee = to.toString();
//
//      if(StringUtils.isNotEmpty(assignee)) {
//         task.setAssignee(assignee);
//      }
      return true;
   }