From ec809f0f35973f5b86c8b5e7cccec8af0bc9803f Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 31 十月 2024 15:09:12 +0800
Subject: [PATCH] 车辆属性一致率阈值bug
---
ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java | 120 ++++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 96 insertions(+), 24 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 29b973e..4b71e63 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,16 +1,27 @@
package com.ycl.platform.controller;
+import annotation.Log;
+import com.ycl.platform.domain.entity.WorkOrderAuditingRecord;
+import com.ycl.platform.domain.entity.WorkOrderWhite;
import com.ycl.platform.domain.form.*;
import com.ycl.platform.domain.query.DistributeWorkOrderQuery;
+import com.ycl.platform.domain.query.WorkOrderExportQuery;
import com.ycl.platform.domain.query.WorkOrderQuery;
+import com.ycl.platform.domain.query.WorkOrderWhiteQuery;
import com.ycl.platform.domain.vo.DistributeWorkOrderVO;
+import com.ycl.platform.domain.vo.WorkOrderVO;
+import com.ycl.platform.domain.vo.WorkOrderYwConditionRecordVO;
import com.ycl.platform.service.WorkOrderService;
import com.ycl.system.Result;
+import com.ycl.system.controller.BaseController;
import com.ycl.system.domain.group.Add;
import com.ycl.system.domain.group.Update;
-import com.ycl.utils.PageUtils;
+import com.ycl.system.page.TableDataInfo;
+import com.ycl.utils.poi.ExcelUtil;
+import enumeration.BusinessType;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotEmpty;
import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -18,7 +29,6 @@
import org.springframework.web.bind.annotation.*;
import java.util.List;
-import java.util.Map;
/**
* 宸ュ崟 鍓嶇鎺у埗鍣�
@@ -31,9 +41,16 @@
@Api(value = "宸ュ崟", tags = "宸ュ崟绠＄悊")
@RestController
@RequestMapping("/work-order")
-public class WorkOrderController {
+public class WorkOrderController extends BaseController {
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 = "娣诲姞")
@@ -56,28 +73,17 @@
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")
@@ -113,9 +119,18 @@
return workOrderService.page(query);
}
+ @PostMapping("/export")
+ @ApiOperation(value = "瀵煎嚭", notes = "瀵煎嚭")
+ @Log(title = "瀵煎嚭宸ュ崟", businessType = BusinessType.EXPORT)
+ public void export(HttpServletResponse response, WorkOrderExportQuery query) {
+ List<WorkOrderVO> results = workOrderService.export(query);
+ ExcelUtil<WorkOrderVO> util = new ExcelUtil<>(WorkOrderVO.class);
+ util.exportExcel(response, results, "宸ュ崟");
+ }
+
@PostMapping("/distribute/page")
@ApiOperation(value = "涓嬪彂鍒嗛〉", notes = "涓嬪彂鍒嗛〉")
- @PreAuthorize("@ss.hasPermi('work:order:distribute')")
+ @PreAuthorize("@ss.hasPermi('work:order:distribute:page')")
public Result distributePage(@RequestBody DistributeWorkOrderQuery query) {
return workOrderService.distributePage(query);
}
@@ -128,7 +143,7 @@
}
@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);
@@ -136,7 +151,7 @@
@GetMapping("/{id}")
@ApiOperation(value = "璇︽儏", notes = "璇︽儏")
- @PreAuthorize("@ss.hasPermi('work:order:query')")
+ @PreAuthorize("@ss.hasPermi('work:order:detail')")
public Result detail(@PathVariable("id") String id) {
return workOrderService.detail(id);
}
@@ -147,4 +162,61 @@
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);
+ }
+
+ /**
+ * 宸ュ崟鐧藉悕鍗曞垪琛�
+ */
+ @PostMapping("/white/page")
+ @ApiOperation(value = "宸ュ崟鐧藉悕鍗曞垪琛�", notes = "宸ュ崟鐧藉悕鍗曞垪琛�")
+ public Result whitePage(@RequestBody WorkOrderWhiteQuery workOrderWhiteQuery)
+ {
+ return workOrderService.selectWorkOrderWhiteList(workOrderWhiteQuery);
+ }
+
+ /**
+ * 娣诲姞宸ュ崟鐧藉悕鍗�
+ *
+ * @param workOrderWhite 鐧借壊宸ュ崟
+ * @return {@link Result }
+ * @author
+ */
+ @PostMapping("/white/add")
+ @ApiOperation(value = "鏂板宸ュ崟鐧藉悕鍗�", notes = "鏂板宸ュ崟鐧藉悕鍗�")
+ public Result addWorkOrderWhite(@RequestBody WorkOrderWhite workOrderWhite) {
+ return workOrderService.addWorkOrderWhite(workOrderWhite);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎宸ュ崟鐧藉悕鍗�
+ *
+ * @param ids ids
+ * @return {@link Result }
+ * @author
+ */
+ @DeleteMapping("/white/batchDelete")
+ @ApiOperation(value = "鎵归噺鍒犻櫎宸ュ崟鐧藉悕鍗�", notes = "鎵归噺鍒犻櫎宸ュ崟鐧藉悕鍗�")
+ public Result batchDeleteWorkOrderWhite(@RequestBody List<String> ids) {
+ return workOrderService.batchDeleteWorkOrderWhite(ids);
+ }
}
--
Gitblit v1.8.0