From f8889f7364adae89e45a5ec3fcf4b38e430cf389 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 10 九月 2024 10:41:18 +0800
Subject: [PATCH] 工单详情
---
ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java | 72 ++++++++++++++++++++++++++---------
1 files changed, 53 insertions(+), 19 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 1356a02..d2067df 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
@@ -1,17 +1,21 @@
package com.ycl.platform.controller;
+import com.ycl.platform.domain.entity.WorkOrderAuditingRecord;
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.platform.domain.vo.WorkOrderYwConditionRecordVO;
import com.ycl.platform.service.WorkOrderService;
import com.ycl.system.Result;
import com.ycl.system.domain.group.Add;
import com.ycl.system.domain.group.Update;
+import com.ycl.utils.PageUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import jakarta.validation.constraints.NotEmpty;
import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -33,46 +37,45 @@
private final WorkOrderService workOrderService;
+ @GetMapping("/process/{workOrderNo}")
+ @ApiOperation(value = "杩囩▼鍥�", notes = "杩囩▼鍥�")
+ @PreAuthorize("@ss.hasPermi('work:order:process')")
+ public Result processImg(@PathVariable("workOrderNo") String workOrderNo) {
+ return workOrderService.processImg(workOrderNo);
+ }
+
@PostMapping
@ApiOperation(value = "娣诲姞", notes = "娣诲姞")
+ @PreAuthorize("@ss.hasPermi('work:order:add')")
public Result add(@RequestBody @Validated(Add.class) WorkOrderForm form) {
return workOrderService.add(form);
}
@PutMapping
@ApiOperation(value = "淇敼", notes = "淇敼")
+ @PreAuthorize("@ss.hasPermi('work:order:edit')")
public Result update(@RequestBody @Validated(Update.class) WorkOrderForm form) {
return workOrderService.update(form);
}
@PutMapping("/auditing")
@ApiOperation(value = "瀹℃牳", notes = "宸ュ崟瀹℃牳")
+ @PreAuthorize("@ss.hasPermi('work:order:audit')")
public Result auditing(@RequestBody @Validated(Update.class) WorkOrderAuditingForm form) {
return workOrderService.auditing(form);
+ }
+
+ @PutMapping("/batchAuditing")
+ @ApiOperation(value = "瀹℃牳", notes = "宸ュ崟鎵归噺瀹℃牳")
+ @PreAuthorize("@ss.hasPermi('work:order:audit')")
+ public Result batchAuditing(@RequestBody @Validated(Update.class) WorkOrderBatchAuditingForm form) {
+ return workOrderService.batchAuditing(form);
}
@PutMapping("/yw-condition")
@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")
@@ -89,49 +92,80 @@
@DeleteMapping("/{id}")
@ApiOperation(value = "ID鍒犻櫎", notes = "ID鍒犻櫎")
+ @PreAuthorize("@ss.hasPermi('work:order:remove')")
public Result removeById(@PathVariable("id") String id) {
return workOrderService.removeById(id);
}
@DeleteMapping("/batch")
@ApiOperation(value = "鎵归噺鍒犻櫎", notes = "鎵归噺鍒犻櫎")
+ @PreAuthorize("@ss.hasPermi('work:order:remove')")
public Result remove(@RequestBody @NotEmpty(message = "璇烽�夋嫨鏁版嵁") List<String> ids) {
return workOrderService.remove(ids);
}
@PostMapping("/page")
@ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
+ @PreAuthorize("@ss.hasPermi('work:order:page')")
public Result page(@RequestBody WorkOrderQuery query) {
return workOrderService.page(query);
}
@PostMapping("/distribute/page")
@ApiOperation(value = "涓嬪彂鍒嗛〉", notes = "涓嬪彂鍒嗛〉")
+ @PreAuthorize("@ss.hasPermi('work:order:distribute:page')")
public Result distributePage(@RequestBody DistributeWorkOrderQuery query) {
return workOrderService.distributePage(query);
}
@PostMapping("/distribute/fast")
@ApiOperation(value = "蹇�熶笅鍙�", notes = "蹇�熶笅鍙�")
+ @PreAuthorize("@ss.hasPermi('work:order:distribute')")
public Result distributeFast(@RequestBody @Validated DistributeWorkOrderVO data) {
return workOrderService.distributeFast(data);
}
@PostMapping("/distribute/ids")
- @ApiOperation(value = "涓嬪彂閫夋嫨", notes = "涓嬪彂閫夋嫨")
+ @ApiOperation(value = "涓嬪彂閫夋嫨鐨勫伐鍗�", notes = "涓嬪彂閫夋嫨閫夋嫨鐨勫伐鍗�")
+ @PreAuthorize("@ss.hasPermi('work:order:distribute')")
public Result selectedIdsDistribute(@RequestBody DistributeWorkOrderQuery query) {
return workOrderService.selectedIdsDistribute(query);
}
@GetMapping("/{id}")
@ApiOperation(value = "璇︽儏", notes = "璇︽儏")
+ @PreAuthorize("@ss.hasPermi('work:order:detail')")
public Result detail(@PathVariable("id") String id) {
return workOrderService.detail(id);
}
@GetMapping("/list")
@ApiOperation(value = "鍒楄〃", notes = "鍒楄〃")
+ @PreAuthorize("@ss.hasPermi('work:order:list')")
public Result list() {
return workOrderService.all();
}
+
+
+
+ @GetMapping("/detail/info/{workOrderNo}")
+ @ApiOperation(value = "璇︽儏", notes = "璇︽儏")
+ @PreAuthorize("@ss.hasPermi('work:order:detail')")
+ public Result detailByNo(@PathVariable("workOrderNo") String workOrderNo) {
+ return workOrderService.detailByNo(workOrderNo);
+ }
+
+ @GetMapping("/yw-condition-list/{workOrderNo}")
+ @ApiOperation(value = "杩愮淮鎯呭喌璁板綍鍒楄〃", notes = "杩愮淮鎯呭喌璁板綍鍒楄〃")
+ public Result ywCondition(@PathVariable String workOrderNo) {
+ List<WorkOrderYwConditionRecordVO> data = workOrderService.selectYwConditionByYwId(workOrderNo);
+ return Result.ok().data(data);
+ }
+
+ @GetMapping("/yw-auditing-list/{workOrderNo}")
+ @ApiOperation(value = "杩愮淮瀹℃牳璁板綍", notes = "杩愮淮瀹℃牳璁板綍")
+ public Result ywAuditingByYwId(@PathVariable String workOrderNo) {
+ List<WorkOrderAuditingRecord> data = workOrderService.selectYwAuditingListByYwId(workOrderNo);
+ return Result.ok().data(data);
+ }
}
--
Gitblit v1.8.0