From 34981c30a78e8bbd7791131059a9210f9928b62c Mon Sep 17 00:00:00 2001
From: 刘光辉 <347230014@qq.com>
Date: 星期四, 17 九月 2026 09:24:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
jnpf-lims/jnpf-lims-controller/src/main/java/jnpf/limsController/LimsSxtKanbanController.java | 62 +++++++++++++++++++++++++++++++
1 files changed, 62 insertions(+), 0 deletions(-)
diff --git a/jnpf-lims/jnpf-lims-controller/src/main/java/jnpf/limsController/LimsSxtKanbanController.java b/jnpf-lims/jnpf-lims-controller/src/main/java/jnpf/limsController/LimsSxtKanbanController.java
new file mode 100644
index 0000000..0bf99f0
--- /dev/null
+++ b/jnpf-lims/jnpf-lims-controller/src/main/java/jnpf/limsController/LimsSxtKanbanController.java
@@ -0,0 +1,62 @@
+package jnpf.limsController;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jnpf.limsEntity.LimsSxtKanbanItemVo;
+import jnpf.limsEntity.LimsSxtKanbanOptionsVo;
+import jnpf.limsEntity.LimsSxtKanbanRowVo;
+import jnpf.limsService.LimsSxtKanbanService;
+import jnpf.util.R;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDate;
+import java.util.List;
+
+@Tag(name = "lims姘寸郴缁熻鍒掔湅鏉�", description = "")
+@RestController
+@RequestMapping("/lims/biz/sxt/kanban")
+public class LimsSxtKanbanController {
+ @Autowired
+ private LimsSxtKanbanService kanbanService;
+
+ @Operation(summary = "姘寸郴缁熻鍒掔湅鏉跨瓫閫夐�夐」")
+ @GetMapping("/options")
+ public R<LimsSxtKanbanOptionsVo> options(
+ @RequestParam(value = "yangpin_leixing", required = false) String type,
+ @RequestParam(value = "suoshu_chejian", required = false) String workshop,
+ @RequestParam(value = "quyang_didian", required = false) String place) {
+ return R.success(kanbanService.listKanbanOptions(
+ trimToNull(type), trimToNull(workshop), trimToNull(place)));
+ }
+
+ @Operation(summary = "姘寸郴缁熻鍒掔湅鏉胯")
+ @GetMapping("/rows")
+ public R<List<LimsSxtKanbanRowVo>> rows(@RequestParam(value = "yangpin_leixing", required = false) String type,
+ @RequestParam(value = "suoshu_chejian", required = false) String workshop, @RequestParam(value = "quyang_didian", required = false) String place,
+ @RequestParam(value = "quyangdian_bianhao", required = false) String point) {
+ return R.success(kanbanService.listKanbanRows(type, workshop, place, point));
+ }
+
+ @Operation(summary = "姘寸郴缁熻鍒掔湅鏉挎棩鍘嗛」")
+ @GetMapping("/items")
+ public R<List<LimsSxtKanbanItemVo>> items(@RequestParam("start_date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate start,
+ @RequestParam("end_date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate end, @RequestParam(value = "yangpin_leixing", required = false) String type,
+ @RequestParam(value = "suoshu_chejian", required = false) String workshop, @RequestParam(value = "quyang_didian", required = false) String place,
+ @RequestParam(value = "quyangdian_bianhao", required = false) String point) {
+ return R.success(kanbanService.listKanbanItems(start, end, type, workshop, place, point));
+ }
+
+ @Operation(summary = "鍙栨秷鏈潵鏈敓鎴愯楠屽崟鐨勮鍒掍换鍔�")
+ @DeleteMapping("/renwu/{renwuId}")
+ public R<String> quxiaoRenwu(@PathVariable String renwuId) {
+ kanbanService.quxiaoWeilaiRenwu(renwuId);
+ return R.success("鍙栨秷鎴愬姛");
+ }
+
+ private String trimToNull(String value) {
+ return StringUtils.hasText(value) ? value.trim() : null;
+ }
+}
--
Gitblit v1.8.0