From 90206a8d6467a7ad80a6caf398a131d284e918c4 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期日, 23 四月 2023 10:01:15 +0800
Subject: [PATCH] 更新大屏1级告警,单据审批
---
src/main/java/com/whyc/controller/WorkflowMainController.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 48 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/whyc/controller/WorkflowMainController.java b/src/main/java/com/whyc/controller/WorkflowMainController.java
index 9ab4887..5a80aa6 100644
--- a/src/main/java/com/whyc/controller/WorkflowMainController.java
+++ b/src/main/java/com/whyc/controller/WorkflowMainController.java
@@ -2,7 +2,7 @@
import com.github.pagehelper.PageInfo;
import com.whyc.dto.Response;
-import com.whyc.pojo.WorkflowLink;
+import com.whyc.pojo.UserInf;
import com.whyc.pojo.WorkflowMain;
import com.whyc.service.WorkflowLinkService;
import com.whyc.service.WorkflowMainService;
@@ -12,7 +12,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.List;
+import java.util.Map;
@RestController
@RequestMapping("workflowMain")
@@ -25,17 +25,56 @@
@Autowired
private WorkflowLinkService linkService;
- @PostMapping("workflowMainList")
- @ApiOperation(value = "鏌ヨ鍚勭姸鎬佸伐鍗曞垪琛�",notes = "寰呭鐞�:type=0,宸插鐞�:type=1,宸插綊妗�:type=2,宸叉挙閿�:type=3")
- public Response<PageInfo<WorkflowMain>> getList(@RequestBody WorkflowMain main,@RequestParam Integer type, @RequestParam Integer pageNum, @RequestParam Integer pageSize){
- Long userId = ActionUtil.getUser().getUId();
- return new Response<PageInfo<WorkflowMain>>().set(1,service.getPendingList(userId,type,pageNum,pageSize,main));
- }
-
@GetMapping("basicInfo")
@ApiOperation(value = "宸ュ崟鍩烘湰鐘舵��")
public Response<WorkflowMain> getBasicInfo(@RequestParam Integer mainId){
return new Response<WorkflowMain>().set(1,service.getBaseInfo(mainId));
}
+ //鏈汉鐨勫崟鎹�: 宸插鎵�,瀹℃壒涓�,宸叉挙閿�,宸查┏鍥�
+ //鎺ユ敹鍒扮殑鍗曟嵁: 寰呭鏍�,(寰呮帴鍗曞鏍�?),宸插鏍�
+ /**
+ * 鏈汉鐨勫崟鎹�:
+ * 宸插鎵�,瀹℃壒涓�,宸叉挙閿�,宸查┏鍥�
+ * */
+ @GetMapping("ownStatistics")
+ @ApiOperation(value = "鏈汉鐨勫崟鎹粺璁�")
+ public Response<Map<Integer,Integer>> getOwnStatistics(int type){
+ int userId = ActionUtil.getUser().getUId().intValue();
+ return service.getOwnStatistics(userId,type);
+ }
+
+ /**
+ * 鏈汉鐨勫崟鎹�:
+ * 宸插鎵�,瀹℃壒涓�,宸叉挙閿�,宸查┏鍥�
+ * */
+ @GetMapping("ownListPage")
+ @ApiOperation(value = "鏈汉鐨勫崟鎹垪琛ㄥ垎椤�")
+ public Response<PageInfo<WorkflowMain>> ownListPage(int type,int status,int pageNum,int pageSize){
+ int userId = ActionUtil.getUser().getUId().intValue();
+ return service.ownListPage(userId,type,status,pageNum,pageSize);
+ }
+
+ /**
+ * 鎺ユ敹鍒扮殑鍗曟嵁:
+ * 鏀剧數璁″垝涓存椂琛ㄤ腑瀛樺湪: 寰呭鏍�,寰呮帴鍗曞鏍�,宸插鏍�
+ * */
+ @GetMapping("receivedStatistics")
+ @ApiOperation(value = "鎺ユ敹鍒扮殑鍗曟嵁缁熻")
+ public Response<Map<Integer,Integer>> getReceivedStatistics(int type){
+ UserInf user = ActionUtil.getUser();
+ return service.getReceivedStatistics(type,user);
+ }
+
+ /**
+ * 鎺ユ敹鍒扮殑鍗曟嵁:
+ * 鏀剧數璁″垝涓存椂琛ㄤ腑瀛樺湪: 寰呭鏍�,寰呮帴鍗曞鏍�,宸插鏍�
+ * */
+ @GetMapping("receivedListPage")
+ @ApiOperation(value = "鎺ユ敹鍒扮殑鍗曟嵁鍒楄〃鍒嗛〉")
+ public Response<PageInfo<WorkflowMain>> getReceivedListPage(int type,int status,int pageNum,int pageSize){
+ UserInf user = ActionUtil.getUser();
+ return service.getReceivedListPage(type,status,user,pageNum,pageSize);
+ }
+
}
--
Gitblit v1.9.1