新巡查流程

guoshilong

2024-02-22 c999c167c21e9e07fb9101f422ce356ac30d325e

 skjcmanager/skjcmanager-ops/skjcmanager-flow/src/main/java/cn/gistack/flow/business/feign/FlowClient.java

@@ -20,6 +20,9 @@
import cn.gistack.flow.core.entity.BladeFlow;
import cn.gistack.flow.core.feign.IFlowClient;
import cn.gistack.flow.core.utils.TaskUtil;
import cn.gistack.flow.core.vo.BladeFlowVO;
import cn.gistack.flow.engine.service.FlowEngineService;
import cn.gistack.sm.patrol.vo.BladeFlowPage;
import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.AllArgsConstructor;
import org.flowable.engine.IdentityService;
@@ -52,6 +55,7 @@
   private final IdentityService identityService;
   private final TaskService taskService;
   private final FlowBusinessService flowBusinessService;
   private final FlowEngineService flowEngineService;

   @Override
   @PostMapping(START_PROCESS_INSTANCE_BY_ID)
@@ -115,12 +119,42 @@

   @Override
   @PostMapping(TODO_LIST)
   public R<List<BladeFlow>> getTodoBladeFlowList(Integer size, Integer current, String currentUserId, BladeFlow bladeFlow) {
   public R<BladeFlowPage> getTodoBladeFlowList(Integer size, Integer current, String currentUserId, BladeFlow bladeFlow) {
      Query query = new Query();
      query.setCurrent(current);
      query.setSize(size);
      IPage<BladeFlow> bladeFlowIPage = flowBusinessService.selectTodoPage(Condition.getPage(query), bladeFlow, currentUserId);
      return R.data(bladeFlowIPage.getRecords());

      BladeFlowPage<BladeFlow> bladeFlowPage = new BladeFlowPage();
      bladeFlowPage.setCurrent(bladeFlowIPage.getCurrent());
      bladeFlowPage.setData(bladeFlowIPage.getRecords());
      bladeFlowPage.setSize(bladeFlowIPage.getSize());
      bladeFlowPage.setTotal(bladeFlowIPage.getTotal());
      return R.data(bladeFlowPage);
   }

   @Override
   @PostMapping(DONE_LIST)
   public R<BladeFlowPage> getDoneBladeFlowList(Integer size, Integer current, String currentUserId, BladeFlowVO bladeFlow) {
      Query query = new Query();
      query.setCurrent(current);
      query.setSize(size);
      IPage<BladeFlowVO> bladeFlowIPage = flowBusinessService.selectDonePage(Condition.getPage(query), bladeFlow, currentUserId);

      BladeFlowPage<BladeFlowVO> bladeFlowPage = new BladeFlowPage();
      bladeFlowPage.setCurrent(bladeFlowIPage.getCurrent());
      bladeFlowPage.setData(bladeFlowIPage.getRecords());
      bladeFlowPage.setSize(bladeFlowIPage.getSize());
      bladeFlowPage.setTotal(bladeFlowIPage.getTotal());

      return R.data(bladeFlowPage);
   }

   @Override
   @GetMapping(HISTORY_FLOW_LIST)
   public R<List<BladeFlow>> historyFlowList(String processInstanceId, String startActivityId, String endActivityId) {
      List<BladeFlow> bladeFlows = flowEngineService.historyFlowList(processInstanceId, startActivityId, endActivityId);
      return R.data(bladeFlows);
   }