From 30cd683e5dbbdd62ff1ca4c72f70e232b0c154e9 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期四, 04 十一月 2021 15:39:09 +0800
Subject: [PATCH] 更新工单待处理,已处理,已归档,已撤销 按条件查询筛选分页
---
src/main/java/com/whyc/controller/WorkflowController.java | 28 +++++++---------------------
1 files changed, 7 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/whyc/controller/WorkflowController.java b/src/main/java/com/whyc/controller/WorkflowController.java
index 3c37bcf..12b69d3 100644
--- a/src/main/java/com/whyc/controller/WorkflowController.java
+++ b/src/main/java/com/whyc/controller/WorkflowController.java
@@ -1,5 +1,7 @@
package com.whyc.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.pagehelper.PageInfo;
import com.whyc.dto.Response;
import com.whyc.pojo.WorkflowMain;
import com.whyc.service.WorkflowMainService;
@@ -7,9 +9,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -21,25 +21,11 @@
@Autowired
private WorkflowMainService mainService;
- @GetMapping("pendList")
- @ApiOperation(value = "寰呭鐞嗗伐鍗�")
- public Response<List<WorkflowMain>> getPendList(){
+ @PostMapping("workflowMainList")
+ @ApiOperation(value = "鏌ヨ鍚勭姸鎬佸伐鍗曞垪琛�",notes = "寰呭鐞�:type=0,宸插鐞�:type=1,宸插綊妗�:type=2")
+ public Response<PageInfo<WorkflowMain>> getWorkflowMainList(@RequestBody WorkflowMain main,@RequestParam Integer type, @RequestParam Integer pageNum, @RequestParam Integer pageSize){
Long userId = ActionUtil.getUser().getUId();
- return new Response<List<WorkflowMain>>().set(1,mainService.getPendingWorkflowList(userId));
- }
-
- @GetMapping("handledList")
- @ApiOperation(value = "宸插鐞嗗伐鍗�")
- public Response<List<WorkflowMain>> getHandledList(){
- Long userId = ActionUtil.getUser().getUId();
- return new Response<List<WorkflowMain>>().set(1,mainService.getHandledList(userId));
- }
-
- @GetMapping("finishList")
- @ApiOperation(value = "宸插綊妗ｅ伐鍗�")
- public Response<List<WorkflowMain>> getFinishList(){
- Long userId = ActionUtil.getUser().getUId();
- return new Response<List<WorkflowMain>>().set(1,mainService.getFinishList(userId));
+ return new Response<PageInfo<WorkflowMain>>().set(1,mainService.getPendingWorkflowList(userId,type,pageNum,pageSize,main));
}
}
--
Gitblit v1.9.1