现场编制功能适配

yangys

2025-09-17 1e2b04fabbbc4b1ae37d7951068d7ab235f5b5f9

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

@@ -18,12 +18,16 @@
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.*;

import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.basesetting.machine.service.MachineService;
import org.springblade.mdm.commons.service.ParamService;
import org.springblade.mdm.flow.constants.FlowContants;
import org.springblade.mdm.flow.constants.FlowVariableContants;
import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.flow.entity.MdmFlowProcess;
import org.springblade.mdm.flow.util.MdmFlowCache;
import org.springblade.mdm.flow.vo.FlowVO;
import org.springblade.mdm.flow.vo.TodoQueryVO;
import org.springblade.system.feign.IUserClient;
import org.springblade.system.pojo.entity.User;
import org.springframework.stereotype.Service;
@@ -45,6 +49,8 @@
   private final HistoryService historyService;
   private final IUserClient userClient;
   private final FlowProgramFileService flowProgramFileService;
   private final ParamService paramService;
   private final MachineService machineService;
   /**
    * 查询我的流程(个人待办列表)
    * @param page 分页信息
@@ -53,21 +59,47 @@
    * @param keyword 查询关键字
    * @return
    */
   public IPage<FlowVO> selectTodoPage(IPage<FlowVO> page, LocalDateTime createTimeBegin, LocalDateTime createTimeEnd, String keyword) {
   public IPage<FlowVO> selectTodoPage(IPage<FlowVO> page, TodoQueryVO queryVO) {//LocalDateTime createTimeBegin, LocalDateTime createTimeEnd, String keyword
      //String taskUser = TaskUtil.getTaskUser();
      String userId = "" + AuthUtil.getUserId();
      List<FlowVO> flowList = new LinkedList<>();

      TaskQuery todoQuery = taskService.createTaskQuery().taskAssignee(userId).active().includeProcessVariables();
      if (Func.isNotEmpty(createTimeBegin)) {
         todoQuery.taskCreatedAfter(DateUtil.toDate(createTimeBegin));

      if(queryVO.getMachineSpec() != null){
         if(queryVO.getMachineSpec().length==1) {//2个为全选
            //查询车床代码集合
            String turnVal = paramService.turninngValue();
            List<Machine> machines = machineService.lambdaQuery().eq(Machine::getMachineSpec, turnVal).eq(Machine::getStatus, Machine.STATUS_ENABLE).list();
            List<String> turnMachineCodes = machines.stream().map(Machine::getCode).toList();

            List<String> specs = Arrays.asList(queryVO.getMachineSpec());
            if (specs.contains("1")) {
               //车床
               todoQuery.or();
               for (String mCode : turnMachineCodes) {
                  todoQuery.processVariableValueEquals(FlowVariableContants.MACHINE_CODE, mCode);
               }
               todoQuery.endOr();
            } else {
               //加工中心
               todoQuery.or();
               for (String mCode : turnMachineCodes) {
                  todoQuery.processVariableValueNotEquals(FlowVariableContants.MACHINE_CODE, mCode);
               }
               todoQuery.endOr();
            }
         }
      }
      if (Func.isNotEmpty(createTimeEnd)) {
         todoQuery.taskCreatedBefore(DateUtil.toDate(createTimeEnd));
         //todoQuery.taskInProgressStartTimeBefore(DateUtil.toDate(createTimeEnd));

      if (Func.isNotEmpty(queryVO.getCreateTimeBegin())) {
         todoQuery.taskCreatedAfter(DateUtil.toDate(queryVO.getCreateTimeBegin()));
      }
      if (Func.isNotEmpty(keyword)) {
         addKeywordCondition(todoQuery, keyword);
      if (Func.isNotEmpty(queryVO.getCreateTimeEnd())) {
         todoQuery.taskCreatedBefore(DateUtil.toDate(queryVO.getCreateTimeEnd()));
      }
      if (Func.isNotEmpty(queryVO.getKeyword())) {
         addKeywordCondition(todoQuery, queryVO.getKeyword());
      }

      todoQuery.orderByTaskCreateTime().desc();