yangys
2025-08-06 053a438acf9ec33e182b25211ce8108f0367feac
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java
@@ -12,10 +12,12 @@
import org.flowable.task.api.Task;
import org.flowable.task.api.TaskQuery;
import org.flowable.task.api.history.HistoricTaskInstance;
import org.springblade.core.launch.constant.FlowConstant;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.*;
import org.springblade.mdm.flow.constants.FlowContants;
import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.flow.entity.MdmFlowProcess;
import org.springblade.mdm.flow.util.MdmFlowCache;
@@ -65,9 +67,6 @@
      TaskQuery todoQuery = taskService.createTaskQuery().taskAssignee(userId).active().includeProcessVariables();
      if (Func.isNotEmpty(createTimeBegin)) {
         todoQuery.taskCreatedAfter(DateUtil.toDate(createTimeBegin));
         ////如果查询实例的开始时间:只能用以下这个,先查出实例id来
         //todoQuery.processInstanceIdIn()
      }
      if (Func.isNotEmpty(createTimeEnd)) {
         todoQuery.taskCreatedBefore(DateUtil.toDate(createTimeEnd));
@@ -82,11 +81,7 @@
      // 构建列表数据
      FlowVO bladeFlow = new FlowVO();
      buildFlowTaskList(bladeFlow, flowList, todoQuery,page.getCurrent(),page.getSize());
      flowList.forEach(flowVO -> {
         if(flowVO.getVariables().containsKey("machineCode")){
            //Machine machinemachineService.getByCode((String)flowVO.getVariables().get("machineCode"))
         }
      });
      // 计算总数
      long count = todoQuery.count();
@@ -99,15 +94,17 @@
   void addKeywordCondition(TaskQuery todoQuery,String keyword) {
      if(Func.isNotEmpty(keyword)) {
         String likeVal = "%" + keyword + "%";
         todoQuery.or();
         todoQuery.processVariableValueLike(FlowContants.TITLE,likeVal);
         todoQuery.processVariableValueLike(FlowContants.PROCESS_NO, likeVal);
         todoQuery.processVariableValueLike(FlowContants.MACHINE_CODE, likeVal);
         todoQuery.processVariableValueLike(FlowContants.MACHINE_MODE, likeVal);
         todoQuery.processVariableValueLike(FlowContants.PROCESS_NAME, likeVal);
         todoQuery.processVariableValueLike(FlowContants.PROCESS_EDITION, likeVal);
         todoQuery.processVariableValueLike(FlowContants.CRAFT_EDITION, likeVal);
         todoQuery.processVariableValueLike("processNo", "%" + keyword + "%");
         todoQuery.processVariableValueLike("machineCode", "%" + keyword + "%");
         todoQuery.processVariableValueLike("machineMode", "%" + keyword + "%");
         todoQuery.processVariableValueLike("processName", "%" + keyword + "%");
         todoQuery.processVariableValueLike("processEdition", "%" + keyword + "%");
         todoQuery.processVariableValueLike("craftEdition", "%" + keyword + "%");
         todoQuery.processDefinitionNameLike(likeVal);
         todoQuery.endOr();
      }
   }