From ee03b526152d335dd1e42bc01a1f717d1205204c Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 26 五月 2025 15:27:04 +0800
Subject: [PATCH] （部级录像可用率，重点录像可用率，录像可用率）计算可用率bug修复，hk接口bug修复，
---
ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java | 68 ++++++++-------------------------
1 files changed, 17 insertions(+), 51 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 10b913d..c3e52a4 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
@@ -4,10 +4,7 @@
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.query.*;
import com.ycl.platform.domain.vo.DistributeWorkOrderVO;
import com.ycl.platform.domain.vo.WorkOrderVO;
import com.ycl.platform.domain.vo.WorkOrderYwConditionRecordVO;
@@ -28,6 +25,7 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import java.io.IOException;
import java.util.List;
/**
@@ -82,35 +80,38 @@
@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);
}
@DeleteMapping("/{id}")
@ApiOperation(value = "ID鍒犻櫎", notes = "ID鍒犻櫎")
@PreAuthorize("@ss.hasPermi('work:order:remove')")
+ @Log(title = "鍒犻櫎宸ュ崟", businessType = BusinessType.DELETE)
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);
- }
+// @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 = "鍒嗛〉")
@@ -196,43 +197,6 @@
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);
- }
-
/**
* 鎵归噺鍒犻櫎宸ュ崟
*
@@ -241,8 +205,10 @@
*/
@DeleteMapping("/batchDelete")
@PreAuthorize("@ss.hasPermi('work:order:delete')")
- @ApiOperation(value = "鎵归噺鍒犻櫎宸ュ崟鐧藉悕鍗�", notes = "鎵归噺鍒犻櫎宸ュ崟鐧藉悕鍗�")
+ @ApiOperation(value = "鎵归噺鍒犻櫎宸ュ崟", notes = "鎵归噺鍒犻櫎宸ュ崟")
+ @Log(title = "鎵归噺鍒犻櫎宸ュ崟", businessType = BusinessType.DELETE)
public Result batchDeleteWorkOrder(@RequestBody List<String> workOrderNos) {
return workOrderService.batchDeleteWorkOrder(workOrderNos);
}
+
}
--
Gitblit v1.8.0