巡检添加已办事务

guoshilong

2023-05-12 586019ba7ccb6088ae8bc5f4bfa78cdede1e3e7e

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

@@ -20,6 +20,8 @@
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.sm.patrol.vo.BladeFlowPage;
import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.AllArgsConstructor;
import org.flowable.engine.IdentityService;
@@ -115,12 +117,35 @@

   @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);
   }