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/UserWorkController.java |   58 +++++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/whyc/controller/UserWorkController.java b/src/main/java/com/whyc/controller/UserWorkController.java
index 2048543..2857ca6 100644
--- a/src/main/java/com/whyc/controller/UserWorkController.java
+++ b/src/main/java/com/whyc/controller/UserWorkController.java
@@ -1,5 +1,6 @@
 package com.whyc.controller;
 
+import com.google.gson.Gson;
 import com.whyc.dto.Response;
 import com.whyc.dto.paramter.UserWorkAlarmParam;
 import com.whyc.pojo.UserInf;
@@ -9,12 +10,15 @@
 import com.whyc.service.WorkAlarmService;
 import com.whyc.util.ActionUtil;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import java.util.List;
+
 @RestController
 @RequestMapping("userwork")
 @Api(tags = "鍛婅娲惧崟")
@@ -26,45 +30,69 @@
     private WorkAlarmService workAlarmService;
 
     @GetMapping("/searchAllByUserIdAndStatus")
-    @ApiOperation(value = "鑾峰彇鍛婅淇℃伅")
-    public Response searchAllByUserIdAndStatus(int pageNum,int pageSize,@RequestParam(required = false) Integer status){
+    @ApiOperation(value = "鏌ヨ缁存姢鍛樺憡璀﹀垪琛�", notes = "鏃�:UserWorkAction!searchAllByUserIdAndStatus")
+    public Response searchAllByUserIdAndStatus(int pageNum,int pageSize,@RequestParam(required = false) Integer note){
         UserInf user = ActionUtil.getUser();
-        return workAlarmService.searchByUserIdAndStatus(pageNum,pageSize,user.getUId().intValue(),status);
+        return workAlarmService.searchByUserIdAndStatus(pageNum,pageSize,user.getUId().intValue(),note);
     }
 
     @PostMapping("/updateWorkAlarm")
-    @ApiOperation(value = "鏇存柊宸ュ崟鍛婅")
+    @ApiOperation(value = "鏇存柊宸ュ崟鍛婅", notes = " 鏃�:UserWorkAction!updateWorkAlarm")
     public Response updateWorkAlarm(@RequestBody WorkAlarm workAlarm){
         return workAlarmService.updateWorkAlarm(workAlarm);
     }
+
     @GetMapping("/searchStatusById")
-    @ApiOperation("閫氳繃id鑾峰彇鍛婅鐘舵�佹暟鎹�")
+    @ApiOperation(value = "閫氳繃id鑾峰彇鍛婅鐘舵�佹暟鎹�(寮�濮嬪鐞嗘洿鏂扮姸鎬�)", notes = "鏃� UserWorkAction!searchStatusById")
     public Response searchStatusById(int id){
         return workAlarmService.searchById(id);
     }
 
     @PostMapping("/uploadAlarmFile")
-    @ApiOperation("涓婁紶鍥剧墖")
-    public Response uploadAlarmFile(@RequestParam MultipartFile[] files, @RequestBody UserWorkAlarmParam param){
-        return userWorkService.uploadAlarmFile(files,param);
+    @ApiOperation(value = "涓婁紶鍥剧墖", notes = " 鏃�:MyFileAction!uploadAlarmFile")
+    @ApiImplicitParam(name = "file", value = "涓婁紶鐨勬枃浠�", dataTypeClass = MultipartFile.class, required = true, paramType = "form")
+    public Response uploadAlarmFile(@RequestPart("file") List<MultipartFile> file, @RequestParam String json) {
+        Gson gson = new Gson();
+        UserWorkAlarmParam alarmParam = gson.fromJson(json, UserWorkAlarmParam.class);
+        return userWorkService.uploadAlarmFile(file, alarmParam);
     }
+
+    @GetMapping("/deleteAlarmFile")
+    @ApiOperation(value = "鍒犻櫎鍥剧墖", notes = " 鏃�:MyFileAction!deleteAlarmFile")
+    public Response deleteAlarmFile(@RequestParam String fileNames, @RequestParam int stationId, @RequestParam String afterOrBefore) {
+        return userWorkService.deleteAlarmFile(fileNames, stationId, afterOrBefore);
+    }
+
     @PostMapping("/updateUserWork")
-    @ApiOperation("鏇存柊鍛婅澶勭悊")
-    public Response updateUserWork(@RequestBody UserWork userWork){
+    @ApiOperation(value = "鏇存柊鍛婅澶勭悊", notes = "鏃�:UserWorkAction!updateUserWork")
+    public Response updateUserWork(@RequestBody UserWork userWork) {
         return userWorkService.addOrUpdate(userWork);
     }
 
     @PostMapping("/serchByCondition")
-    @ApiOperation("鏌ヨ鍛婅澶勭悊璇︽儏")
-    public Response serchByCondition(@RequestBody UserWork userWork){
+    @ApiOperation(value = "鏌ヨ鍛婅澶勭悊璇︽儏", notes = "鏃�:UserWorkAction!serchByCondition")
+    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){
+    @ApiOperation(value = "鏌ヨ绠＄悊鍛樺憡璀﹀垪琛�", notes = "鏃�:WorkAlarmAction!getTaskListWithFlag")
+    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);
+        return workAlarmService.getTaskListWithFlag(userInf.getUId().intValue(), note, pageNum, pageSize);
+    }
+
+    @GetMapping("getTaskListWithFlagNew")
+    @ApiOperation(value = "鏌ヨ绠＄悊鍛樺憡璀﹀垪琛�2.0椤甸潰", notes = "鏃�:WorkAlarmAction!getTaskListWithFlag")
+    public Response getTaskListWithFlagNew(@RequestParam Integer note, @RequestParam int pageNum, @RequestParam int pageSize) {
+        UserInf userInf = ActionUtil.getUser();
+        return workAlarmService.getTaskListWithFlagNew(userInf.getUId().intValue(), note, pageNum, pageSize);
+    }
+
+    @PostMapping("/dispatchTask")
+    @ApiOperation(value = "纭鎸囨淳浠诲姟璁㈠崟", notes = "鏃�:WorkAlarmAction!dispatchTask")
+    public Response dispatchTask(@RequestBody List<WorkAlarm> alarmList) {
+        return workAlarmService.dispatchTask(alarmList);
     }
 
 

--
Gitblit v1.9.1