From b91945ea32378a71d1e57356af6e16703a1ceaa7 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 01 十一月 2024 14:52:16 +0800
Subject: [PATCH] 工单只下发考核的、阈值bug
---
ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java | 61 ++++++++++++++++++++++++++++--
1 files changed, 56 insertions(+), 5 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 d2067df..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,18 +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;
@@ -20,7 +29,6 @@
import org.springframework.web.bind.annotation.*;
import java.util.List;
-import java.util.Map;
/**
* 宸ュ崟 鍓嶇鎺у埗鍣�
@@ -33,7 +41,7 @@
@Api(value = "宸ュ崟", tags = "宸ュ崟绠＄悊")
@RestController
@RequestMapping("/work-order")
-public class WorkOrderController {
+public class WorkOrderController extends BaseController {
private final WorkOrderService workOrderService;
@@ -111,6 +119,15 @@
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:page')")
@@ -146,8 +163,6 @@
return workOrderService.all();
}
-
-
@GetMapping("/detail/info/{workOrderNo}")
@ApiOperation(value = "璇︽儏", notes = "璇︽儏")
@PreAuthorize("@ss.hasPermi('work:order:detail')")
@@ -168,4 +183,40 @@
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