From 1de0d92e2a630927f391ae080709ae678e5f5618 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期三, 17 四月 2024 15:28:46 +0800
Subject: [PATCH] 工单事后报备：新增点位id
---
ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java | 44 ++++++++++++++++++++++++++++++++++----------
1 files changed, 34 insertions(+), 10 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java b/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java
index cfb6d38..4fcdc76 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java
@@ -2,21 +2,21 @@
import com.ycl.platform.domain.form.*;
import com.ycl.platform.domain.query.DistributeWorkOrderQuery;
+import com.ycl.platform.domain.query.WorkOrderQuery;
import com.ycl.platform.domain.vo.DistributeWorkOrderVO;
-import com.ycl.system.domain.group.Update;
-import com.ycl.system.domain.group.Add;
-import org.springframework.validation.annotation.Validated;
-import lombok.RequiredArgsConstructor;
-import java.util.List;
-import org.springframework.validation.annotation.Validated;
-import jakarta.validation.constraints.NotEmpty;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
import com.ycl.platform.service.WorkOrderService;
import com.ycl.system.Result;
-import com.ycl.platform.domain.query.WorkOrderQuery;
+import com.ycl.system.domain.group.Add;
+import com.ycl.system.domain.group.Update;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import jakarta.validation.constraints.NotEmpty;
import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
/**
* 宸ュ崟 鍓嶇鎺у埗鍣�
@@ -55,6 +55,24 @@
@ApiOperation(value = "杩愮淮鎯呭喌", notes = "杩愮淮鎯呭喌")
public Result ywCondition(@RequestBody @Validated(Update.class) WorkOrderYWConditionForm form) {
return workOrderService.ywCondition(form);
+ }
+
+ @GetMapping("/yw-condition/{id}")
+ @ApiOperation(value = "杩愮淮鎯呭喌", notes = "杩愮淮鎯呭喌")
+ public Result ywCondition(@PathVariable @Validated(Update.class) String id) {
+ return workOrderService.selectYwConditionByYwId(id);
+ }
+
+ @GetMapping("/yw-condition-list/{id}")
+ @ApiOperation(value = "杩愮淮鎯呭喌璁板綍", notes = "杩愮淮鎯呭喌璁板綍")
+ public Result ywConditionList(@PathVariable @Validated(Update.class) String id) {
+ return workOrderService.selectYwConditionListByYwId(id);
+ }
+
+ @GetMapping("/yw-auditing-list/{id}")
+ @ApiOperation(value = "杩愮淮瀹℃牳璁板綍", notes = "杩愮淮瀹℃牳璁板綍")
+ public Result ywAuditingByYwId(@PathVariable @Validated(Update.class) String id) {
+ return workOrderService.selectYwAuditingListByYwId(id);
}
@PutMapping("/yw-result")
@@ -99,6 +117,12 @@
return workOrderService.distributeFast(data);
}
+ @PostMapping("/distribute/ids")
+ @ApiOperation(value = "涓嬪彂閫夋嫨", notes = "涓嬪彂閫夋嫨")
+ public Result selectedIdsDistribute(@RequestBody DistributeWorkOrderQuery query) {
+ return workOrderService.selectedIdsDistribute(query.getIds(), query.getUnitId());
+ }
+
@GetMapping("/{id}")
@ApiOperation(value = "璇︽儏", notes = "璇︽儏")
public Result detail(@PathVariable("id") String id) {
--
Gitblit v1.8.0