From 9f7777c83f2d07c8d83c506ab2a13bc543f47de9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 10 四月 2025 11:08:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/src/main/java/com/doumee/api/web/WebWorkOrderController.java |   88 ++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 88 insertions(+), 0 deletions(-)

diff --git a/server/src/main/java/com/doumee/api/web/WebWorkOrderController.java b/server/src/main/java/com/doumee/api/web/WebWorkOrderController.java
index f77fa7c..b4d14cc 100644
--- a/server/src/main/java/com/doumee/api/web/WebWorkOrderController.java
+++ b/server/src/main/java/com/doumee/api/web/WebWorkOrderController.java
@@ -5,9 +5,13 @@
 import com.doumee.core.constants.ResponseStatus;
 import com.doumee.core.exception.BusinessException;
 import com.doumee.core.model.ApiResponse;
+import com.doumee.dao.business.model.Managers;
 import com.doumee.dao.business.model.Member;
 import com.doumee.dao.business.model.Workorder;
+import com.doumee.dao.web.dto.CloseDTO;
+import com.doumee.dao.web.dto.PassOnDTO;
 import com.doumee.dao.web.dto.UpdEmailDTO;
+import com.doumee.dao.web.vo.WorkOrderDataVO;
 import com.doumee.service.business.ManagersService;
 import com.doumee.service.business.MemberService;
 import com.doumee.service.business.WorkorderService;
@@ -19,6 +23,7 @@
 import org.springframework.web.server.ServerWebExchange;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * Created by IntelliJ IDEA.
@@ -62,6 +67,21 @@
     }
 
 
+    @LoginRequired
+    @ApiOperation("閫氱煡浜烘煡璇�")
+    @PostMapping("/managersList")
+    public ApiResponse<List<Managers>> managersList (@RequestBody Managers model, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token, ServerWebExchange serverWebExchange) {
+        try {
+            ServerHttpRequest request = serverWebExchange.getRequest();
+            return ApiResponse.success(managersService.findList(model));
+        }catch (BusinessException e){
+            return ApiResponse.failed(e.getCode(),e.getMessage());
+        }catch (Exception e){
+            e.printStackTrace();
+            return ApiResponse.failed(ResponseStatus.SERVER_ERROR);
+        }
+    }
+
 
     @LoginRequired
     @ApiOperation("椋庨櫓涓婃姤璇︽儏")
@@ -80,9 +100,77 @@
 
 
 
+    @LoginRequired
+    @ApiOperation("宸ュ崟鍏抽棴")
+    @PostMapping("/closeWorkOrder")
+    public ApiResponse closeWorkOrder(@RequestBody CloseDTO closeDTO, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token, ServerWebExchange serverWebExchange) {
+        try {
+            ServerHttpRequest request = serverWebExchange.getRequest();
+            closeDTO.setMember(jwtTokenUtil.getUserInfoByToken(token));
+            workorderService.closeWorkOrder(closeDTO);
+            return ApiResponse.success("鎿嶄綔鎴愬姛");
+        }catch (BusinessException e){
+            return ApiResponse.failed(e.getCode(),e.getMessage());
+        }catch (Exception e){
+            e.printStackTrace();
+            return ApiResponse.failed(ResponseStatus.SERVER_ERROR);
+        }
+    }
 
 
 
 
+    @LoginRequired
+    @ApiOperation("宸ュ崟鎸囨淳")
+    @PostMapping("/passOn")
+    public ApiResponse passOn(@RequestBody PassOnDTO passOnDTO, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token, ServerWebExchange serverWebExchange) {
+        try {
+            ServerHttpRequest request = serverWebExchange.getRequest();
+            passOnDTO.setMember(jwtTokenUtil.getUserInfoByToken(token));
+            workorderService.passOn(passOnDTO);
+            return ApiResponse.success("鎿嶄綔鎴愬姛");
+        }catch (BusinessException e){
+            return ApiResponse.failed(e.getCode(),e.getMessage());
+        }catch (Exception e){
+            e.printStackTrace();
+            return ApiResponse.failed(ResponseStatus.SERVER_ERROR);
+        }
+    }
+
+
+
+    @LoginRequired
+    @ApiOperation("宸ュ崟鍌績")
+    @GetMapping("/urge")
+    public ApiResponse urge(@RequestParam Integer workorderId, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token, ServerWebExchange serverWebExchange) {
+        try {
+            ServerHttpRequest request = serverWebExchange.getRequest();
+            workorderService.urge(workorderId,jwtTokenUtil.getUserInfoByToken(token));
+            return ApiResponse.success("鎿嶄綔鎴愬姛");
+        }catch (BusinessException e){
+            return ApiResponse.failed(e.getCode(),e.getMessage());
+        }catch (Exception e){
+            e.printStackTrace();
+            return ApiResponse.failed(ResponseStatus.SERVER_ERROR);
+        }
+    }
+
+    @LoginRequired
+    @ApiOperation("鎶ヨ〃")
+    @GetMapping("/getWorkOrderData")
+    public ApiResponse<List<WorkOrderDataVO>> getWorkOrderData(@RequestParam Integer queryType, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token, ServerWebExchange serverWebExchange) {
+        try {
+            ServerHttpRequest request = serverWebExchange.getRequest();
+            return ApiResponse.success(workorderService.getWorkOrderData(queryType));
+        }catch (BusinessException e){
+            return ApiResponse.failed(e.getCode(),e.getMessage());
+        }catch (Exception e){
+            e.printStackTrace();
+            return ApiResponse.failed(ResponseStatus.SERVER_ERROR);
+        }
+    }
+
+
+
 
 }

--
Gitblit v1.9.3