From 160e150009b51a39fa95d9462c3798ba28d51a09 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期二, 15 八月 2023 08:49:47 +0800
Subject: [PATCH] 审批页面修改

---
 src/main/java/com/whyc/controller/FaultUploadController.java |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/whyc/controller/FaultUploadController.java b/src/main/java/com/whyc/controller/FaultUploadController.java
index 51bdcfb..1658afa 100644
--- a/src/main/java/com/whyc/controller/FaultUploadController.java
+++ b/src/main/java/com/whyc/controller/FaultUploadController.java
@@ -3,6 +3,7 @@
 import com.whyc.dto.Response;
 import com.whyc.pojo.FaultUpload;
 import com.whyc.service.FaultUploadService;
+import com.whyc.util.ActionUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,7 +24,7 @@
     }
 
     @PutMapping("confirm")
-    @ApiOperation("纭")
+    @ApiOperation(value = "纭",notes = "灞炴�tatus:-1-纭涓嶅睘瀹�,1-纭灞炲疄")
     public Response updateConfirm(@RequestBody FaultUpload fault){
         return service.updateConfirm(fault);
     }
@@ -32,38 +33,44 @@
     @ApiOperation(value = "鍒楄〃鍒嗛〉-缁勫唴",notes = "鍖呮満缁勫唴鎴愬憳鍙")
     public Response listPage(@RequestParam int pageNum,@RequestParam int pageSize,
                              @RequestBody FaultUpload upload){
-        return service.listPage(pageNum, pageSize,upload);
+        int userId = ActionUtil.getUser().getUId().intValue();
+        return service.listPage(pageNum, pageSize,upload,userId);
     }
 
     @GetMapping("typeCount")
     @ApiOperation(value = "闅愭偅鏁呴殰涓婃姤绫诲瀷缁熻",notes = "timeType:涓嶄紶-鎵�鏈�,1-鏈湀,2-鏈搴�,3-鏈勾")
     public Response getTypeCount(@RequestParam(required = false) Integer timeType){
-        return service.getTypeCount(timeType);
+        int userId = ActionUtil.getUser().getUId().intValue();
+        return service.getTypeCount(timeType,userId);
     }
 
     @PostMapping("listPage2")
     @ApiOperation(value = "鍒楄〃鍒嗛〉-绠$悊")
     public Response listPage2(@RequestParam int pageNum,@RequestParam int pageSize,
                               @RequestBody FaultUpload upload){
-        return service.listPage2(pageNum, pageSize,upload);
+        int userId = ActionUtil.getUser().getUId().intValue();
+        return service.listPage2(pageNum, pageSize,upload,userId);
     }
 
     @GetMapping("groupNameCount")
     @ApiOperation(value = "闅愭偅鏁呴殰涓婃姤缁熻-绠$悊",notes = "timeType:1-鏈湀,2-鏈搴�,3-鏈勾")
     public Response groupNameCount(@RequestParam int timeType){
-        return service.groupNameCount(timeType);
+        int userId = ActionUtil.getUser().getUId().intValue();
+        return service.groupNameCount(timeType,userId);
     }
 
     @GetMapping("listOfLastPeriod")
     @ApiOperation(value = "闅愭偅鏁呴殰涓婃姤杩涘害-鏈�杩戜竴鍛ㄥ強鏈�杩戜竴鏈�-绠$悊",notes = "type:1-鏈�杩戜竴鍛�,2-鏈�杩戜竴鏈�")
     public Response getListOfLastPeriod(int type){
-        return service.getListOfLastPeriod(type);
+        int userId = ActionUtil.getUser().getUId().intValue();
+        return service.getListOfLastPeriod(type,userId);
     }
 
     @GetMapping("myUploadStatusCount")
     @ApiOperation(value = "鎴戠殑闅愭偅鏁呴殰涓婃姤鐘舵�佹暟閲忕粺璁�")
     public Response getMyUploadStatusCount(){
-        return service.getMyUploadStatusCount();
+        int userId = ActionUtil.getUser().getUId().intValue();
+        return service.getMyUploadStatusCount(userId);
     }
 
 }

--
Gitblit v1.9.1