From d22bbb827940050d4df2bf3fb16dae79eba91d4e Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 12 十一月 2024 18:45:15 +0800
Subject: [PATCH] 批量审核bug，离线时间点回显
---
ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java | 123 ++++++++++++++++++++++++++++++++++++----
1 files changed, 109 insertions(+), 14 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 16e8e69..3b1c71d 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,7 +41,7 @@
@Api(value = "宸ュ崟", tags = "宸ュ崟绠＄悊")
@RestController
@RequestMapping("/work-order")
-public class WorkOrderController {
+public class WorkOrderController extends BaseController {
private final WorkOrderService workOrderService;
@@ -72,19 +82,21 @@
@PutMapping("/yw-condition")
@ApiOperation(value = "杩愮淮鎯呭喌", notes = "杩愮淮鎯呭喌")
- public Result ywCondition(@RequestBody @Validated(Update.class) WorkOrderYWConditionForm form) {
+ public Result ywCondition(@RequestBody @Validated WorkOrderYWConditionForm form) {
return workOrderService.ywCondition(form);
}
+ //鐜板湪娌＄敤
@PutMapping("/yw-result")
@ApiOperation(value = "杩愮淮缁撴灉", notes = "杩愮淮缁撴灉")
- public Result ywCondition(@RequestBody @Validated(Update.class) WorkOrderYWResultForm form) {
+ public Result ywResult(@RequestBody @Validated WorkOrderYWResultForm form) {
return workOrderService.ywResult(form);
}
+ //鐜板湪娌＄敤
@PutMapping("/check-result")
@ApiOperation(value = "妫�娴嬬粨鏋�", notes = "妫�娴嬬粨鏋�")
- public Result ywCondition(@RequestBody @Validated(Update.class) WorkOrderCheckResultForm form) {
+ public Result ywCheckResult(@RequestBody @Validated WorkOrderCheckResultForm form) {
return workOrderService.checkResult(form);
}
@@ -95,18 +107,27 @@
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);
- }
+// @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("/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")
@@ -137,6 +158,13 @@
return workOrderService.detail(id);
}
+ @GetMapping("/check")
+ @ApiOperation(value = "鍥剧墖妫�娴�", notes = "鍥剧墖妫�娴�")
+ @PreAuthorize("@ss.hasPermi('work:order:check')")
+ public Result check(String workOrderNo,String serialNumber) {
+ return workOrderService.checkImage(workOrderNo,serialNumber);
+ }
+
@GetMapping("/list")
@ApiOperation(value = "鍒楄〃", notes = "鍒楄〃")
@PreAuthorize("@ss.hasPermi('work:order:list')")
@@ -144,12 +172,79 @@
return workOrderService.all();
}
-
-
+ @GetMapping("/errorType/list")
+ @ApiOperation(value = "鏁呴殰鍒楄〃", notes = "鏁呴殰鍒楄〃")
+ @PreAuthorize("@ss.hasPermi('work:order:list')")
+ public Result errorList() {
+ return workOrderService.errorAll();
+ }
@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);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎宸ュ崟
+ *
+ * @return {@link Result }
+ * @author
+ */
+ @DeleteMapping("/batchDelete")
+ @PreAuthorize("@ss.hasPermi('work:order:delete')")
+ @ApiOperation(value = "鎵归噺鍒犻櫎宸ュ崟", notes = "鎵归噺鍒犻櫎宸ュ崟")
+ public Result batchDeleteWorkOrder(@RequestBody List<String> workOrderNos) {
+ return workOrderService.batchDeleteWorkOrder(workOrderNos);
+ }
}
--
Gitblit v1.8.0