流程查询按时间搜索错误问题修改

yangys

2025-08-14 047bb771200a233eff32141b963cfdc5b362b4a1

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java

@@ -6,11 +6,13 @@
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.SerializationException;
import org.apache.commons.lang3.StringUtils;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.TaskService;
import org.flowable.engine.runtime.ProcessInstance;
import org.flowable.task.api.Task;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.support.Kv;
@@ -25,8 +27,10 @@
import org.springblade.mdm.flow.service.FlowProgramFileService;
import org.springblade.mdm.flow.service.TaskDispatchService;
import org.springblade.mdm.flow.service.execute.AbstractFlowCompleteService;
import org.springblade.mdm.flow.service.execute.BatchDispatchService;
import org.springblade.mdm.flow.service.execute.DefaultFlowCompleteService;
import org.springblade.mdm.flow.service.execute.TryFlowCompleteService;
import org.springblade.mdm.flow.vo.BatchDispatchVO;
import org.springblade.mdm.flow.vo.TaskAssignVO;
import org.springblade.mdm.program.entity.ProcessProgRef;
import org.springblade.mdm.program.service.NcNodeAutoCreateService;
@@ -61,6 +65,8 @@
   private final TryFlowCompleteService tryFlowCompleteService;
   private final DefaultFlowCompleteService defaultFlowCompleteService;
   private final TaskDispatchService taskDispatchService;
   private final BatchDispatchService dispatchService;

   /**
    * 发起派工流程
    */
@@ -80,7 +86,7 @@

   AbstractFlowCompleteService getActualService(String processInstanceId){
      ProcessInstance inst = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
      if(inst.getProcessDefinitionKey().equals(FlowContants.TRY_PROCESS_KEY) || inst.getProcessDefinitionKey().equals(FlowContants.CURE_PROCESS_KEY)){
      if(inst.getProcessDefinitionKey().equals(FlowContants.TRY_PROCESS_KEY) || inst.getProcessDefinitionKey().equals(FlowContants.CURE_PROCESS_KEY) || inst.getProcessDefinitionKey().equals(FlowContants.REPLACE_PROCESS_KEY)){
         return tryFlowCompleteService;
      }else{
         return defaultFlowCompleteService;
@@ -92,57 +98,52 @@
      try {
         AbstractFlowCompleteService completeService = getActualService(processInstanceId);
         completeService.completeTask(taskId, processInstanceId, comment, variables);


         return R.success("流程提交成功");
      }catch(Exception e){
         return R.fail(e.getMessage());
      }
      /*
      Task task = taskService.createTaskQuery()
         .taskId(taskId)
         .singleResult();
      String operateResult = variables.get("approve")+"";
      if(task.getTaskDefinitionKey().equals("programmingTask")) {//编制节点
         flowProgramFileService.checkProgramFiles(processInstanceId,"Y".equals(operateResult));
      }
      // 增加评论
      if (StringUtil.isNoneBlank(processInstanceId, comment)) {
         taskService.addComment(taskId, processInstanceId, comment);
      }
      // 非空判断
      if (Func.isEmpty(variables)) {
         variables = Kv.create();
      }

      //加入审批用户
      variables.put(FlowContants.LAST_STEP_USER_NICKNAME,AuthUtil.getNickName());

      if(variables.containsKey("assignee")){
         addApproveRecord(taskId,comment,variables);

         //在编制任务时，创建节点（没有节点则创建，有就直接使用
         if(task.getTaskDefinitionKey().equals("programmingTask") && "Y".equals(operateResult)) {
            ncNodeAutoCreateService.createNodeTreeWithProgram(flowCommonService.getProgramProperties(processInstanceId));
         }
         if(!"confirmIsUseableTask".equals(task.getTaskDefinitionKey())){

            variables.remove(FlowContants.PROCESS_EDITION);//TODO 临时错误是，组长提交的时候会提交一个空串，清空了内部数据
         }else{
            //升版

         }

         //指定了下一步执行人
         taskService.complete(taskId, variables);

         return R.success("流程提交成功");
      }else {
         // 完成任务,给默认用户
         return R.fail("请指定流程下一步处理人");
      }*/


   }

   @Operation(summary = "手动批量派工", description = "组长手动批量派工")
   @PostMapping("batchDispatch")
   public R<Void> batchDispatch(@RequestBody BatchDispatchVO batchDispatchVO) {
      try {
         dispatchService.batchDispatchTask(batchDispatchVO);
         return R.success("流程提交成功");
      }catch(Exception e){
         return R.fail(e.getMessage());
      }

   }

   @Operation(summary = "自动批量派工", description = "组长批量派工，后端自动查找处理人")
   @PostMapping("batchDispatchAuto")
   public R<Void> batchDispatchAuto(@RequestBody BatchDispatchVO batchDispatchVO) {
      try {
         dispatchService.batchAutoDispatchTask(batchDispatchVO);
         return R.success("流程提交成功");
      }catch(Exception e){
         return R.fail(e.getMessage());
      }

   }

   @Operation(summary = "批量审批", description = "高师批量审批")
   @PostMapping("batchApprove")
   public R<Void> batchApprove(@RequestBody BatchDispatchVO batchDispatchVO) {
      try {
         dispatchService.batchApprove(batchDispatchVO);
         return R.success("流程提交成功");
      }catch(Exception e){
         return R.fail(e.getMessage());
      }

   }
   /*
   void addApproveRecord(String taskId,String comment,Map<String, Object> variables){
      String operateResult = variables.get("approve")+"";

@@ -151,5 +152,5 @@
         .singleResult();
      approveRecordService.saveApproveRecords(task,operateResult,comment);

   }
   }*/
}