From 1d1dc6907fd1e4eb7e0d87d69d2d5473be66c79c Mon Sep 17 00:00:00 2001
From: whyczh <hzjl@qq.com>
Date: 星期四, 19 五月 2022 16:08:03 +0800
Subject: [PATCH] 告警工单部分接口

---
 src/main/java/com/whyc/controller/UserWorkController.java |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/whyc/controller/UserWorkController.java b/src/main/java/com/whyc/controller/UserWorkController.java
index 4ea0da0..2048543 100644
--- a/src/main/java/com/whyc/controller/UserWorkController.java
+++ b/src/main/java/com/whyc/controller/UserWorkController.java
@@ -1,10 +1,9 @@
 package com.whyc.controller;
 
-import com.baomidou.mybatisplus.extension.api.R;
 import com.whyc.dto.Response;
 import com.whyc.dto.paramter.UserWorkAlarmParam;
-import com.whyc.mapper.WorkAlarmMapper;
 import com.whyc.pojo.UserInf;
+import com.whyc.pojo.UserWork;
 import com.whyc.pojo.WorkAlarm;
 import com.whyc.service.UserWorkService;
 import com.whyc.service.WorkAlarmService;
@@ -28,7 +27,7 @@
 
     @GetMapping("/searchAllByUserIdAndStatus")
     @ApiOperation(value = "鑾峰彇鍛婅淇℃伅")
-    public Response searchAllByUserIdAndStatus(int pageNum,int pageSize,Integer status){
+    public Response searchAllByUserIdAndStatus(int pageNum,int pageSize,@RequestParam(required = false) Integer status){
         UserInf user = ActionUtil.getUser();
         return workAlarmService.searchByUserIdAndStatus(pageNum,pageSize,user.getUId().intValue(),status);
     }
@@ -49,8 +48,24 @@
     public Response uploadAlarmFile(@RequestParam MultipartFile[] files, @RequestBody UserWorkAlarmParam param){
         return userWorkService.uploadAlarmFile(files,param);
     }
+    @PostMapping("/updateUserWork")
+    @ApiOperation("鏇存柊鍛婅澶勭悊")
+    public Response updateUserWork(@RequestBody UserWork userWork){
+        return userWorkService.addOrUpdate(userWork);
+    }
 
+    @PostMapping("/serchByCondition")
+    @ApiOperation("鏌ヨ鍛婅澶勭悊璇︽儏")
+    public Response serchByCondition(@RequestBody UserWork userWork){
+        return userWorkService.searchByCondition(userWork);
+    }
 
+    @GetMapping("getTaskListWithFlag")
+    @ApiOperation("鏌ヨ缁存姢鍛樺憡璀﹀垪琛�")
+    public Response getTaskListWithFlag(@RequestParam Integer note,@RequestParam int pageNum,@RequestParam int pageSize){
+        UserInf userInf = ActionUtil.getUser();
+        return workAlarmService.getTaskListWithFlag(userInf.getUId().intValue(),note,pageNum,pageSize);
+    }
 
 
 }

--
Gitblit v1.9.1