From 042936ba89e122bece0e4ce595c68f859b9e9bed Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期三, 17 四月 2024 17:53:43 +0800
Subject: [PATCH] 工单下发：新增互斥锁、下发记录
---
ycl-server/src/main/java/com/ycl/platform/controller/YwUnitController.java | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/YwUnitController.java b/ycl-server/src/main/java/com/ycl/platform/controller/YwUnitController.java
index 8ca1397..40e2f3b 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/YwUnitController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/YwUnitController.java
@@ -1,14 +1,21 @@
package com.ycl.platform.controller;
+import com.ycl.platform.domain.query.ReportQuery;
+import com.ycl.platform.domain.vo.ReportVO;
+import com.ycl.platform.domain.vo.YwUnitVO;
import com.ycl.system.Result;
import com.ycl.platform.domain.form.YwUnitForm;
import com.ycl.system.domain.group.Update;
import com.ycl.system.domain.group.Add;
import com.ycl.platform.domain.query.YwUnitQuery;
import com.ycl.platform.service.YwUnitService;
+import com.ycl.utils.poi.ExcelUtil;
+import jakarta.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import lombok.RequiredArgsConstructor;
+
+import java.util.Arrays;
import java.util.List;
import jakarta.validation.constraints.NotEmpty;
@@ -43,16 +50,10 @@
return ywUnitService.update(form);
}
- @DeleteMapping("/{id}")
- @ApiOperation(value = "ID鍒犻櫎", notes = "ID鍒犻櫎")
- public Result removeById(@PathVariable("id") String id) {
- return ywUnitService.removeById(id);
- }
-
- @DeleteMapping("/batch")
+ @DeleteMapping("/{ids}")
@ApiOperation(value = "鎵归噺鍒犻櫎", notes = "鎵归噺鍒犻櫎")
- public Result remove(@RequestBody @NotEmpty(message = "璇烽�夋嫨鏁版嵁") List<String> ids) {
- return ywUnitService.remove(ids);
+ public Result remove(@PathVariable String ids) {
+ return ywUnitService.remove(Arrays.asList(ids.split(",")));
}
// @PreAuthorize("@ss.hasPermi('unit:list')")
@@ -73,4 +74,18 @@
public Result list() {
return ywUnitService.all();
}
+
+ @GetMapping("/work/list")
+ @ApiOperation(value = "宸ュ崟鍒楄〃", notes = "宸ュ崟鍒楄〃")
+ public Result workList() {
+ return ywUnitService.workList();
+ }
+
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, YwUnitQuery query)
+ {
+ List<YwUnitVO> list = ywUnitService.export(query);
+ ExcelUtil<YwUnitVO> util = new ExcelUtil<>(YwUnitVO.class);
+ util.exportExcel(response, list, "鎶ュ");
+ }
}
--
Gitblit v1.8.0