| | |
| | | @GetMapping("/confirm-page") |
| | | @ApiOperationSupport(order = 3) |
| | | @Operation(summary = "确认单列表", description = "确认单列表") |
| | | public R<IPage<FlowVO>> finishedList(@Parameter(description = "流程名称")String myProcessName, @Parameter(description = "流程创建时间开始") LocalDateTime createTimeBegin, @Parameter(description = "流程创建时间截止") LocalDateTime createTimeEnd, @Parameter(description = "关键字") String keyword, Query query) { |
| | | IPage<FlowVO> pages = confirmTablePrintService.confirmTablePage(Condition.getPage(query), myProcessName,keyword,createTimeBegin,createTimeEnd); |
| | | public R<IPage<FlowVO>> confirmPage( @Parameter(description = "流程创建时间开始") LocalDateTime createTimeBegin, @Parameter(description = "流程创建时间截止") LocalDateTime createTimeEnd, @Parameter(description = "零组件号") String drawingNo, Query query) { |
| | | IPage<FlowVO> pages = confirmTablePrintService.confirmTablePage(Condition.getPage(query), drawingNo,createTimeBegin,createTimeEnd); |
| | | return R.data(pages); |
| | | } |
| | | |
| | |
| | | * @param page 分页信息 |
| | | * @param createTimeBegin |
| | | * @param createTimeEnd |
| | | * @param keyword 关键字 |
| | | * @param drawingNo 关键字 |
| | | * @return |
| | | */ |
| | | public IPage<FlowVO> confirmTablePage(IPage<FlowVO> page, String drawingNo, String keyword,LocalDateTime createTimeBegin, LocalDateTime createTimeEnd) { |
| | | public IPage<FlowVO> confirmTablePage(IPage<FlowVO> page, String drawingNo, LocalDateTime createTimeBegin, LocalDateTime createTimeEnd) { |
| | | //固化里路村官 |
| | | HistoricProcessInstanceQuery query = this.historyService.createHistoricProcessInstanceQuery().finished().processDefinitionKey(FlowConstant.CURE_PROCESS_KEY).includeProcessVariables(); |
| | | //.finished() // 只查询已完成的流程.unfinished() // 查询未完成的流程 |
| | |
| | | query.orderByProcessInstanceEndTime().desc(); // 按结束时间降序排列 |
| | | |
| | | IPage<NewProgrammingVO> page = new Page<>(); |
| | | long firstResult = (page.getCurrent()-1) * page.getSize(); |
| | | List<HistoricProcessInstance> processes = query.listPage((int)firstResult,(int)queryVO.getSize()); |
| | | long firstResult = (long) (queryVO.getCurrent() - 1) * queryVO.getSize(); |
| | | List<HistoricProcessInstance> processes = query.listPage((int)firstResult,queryVO.getSize()); |
| | | |
| | | page.setTotal(query.count()); |
| | | |