From 901bab9b8b1c3773a644bdc74f5eafd666591aeb Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 17 九月 2026 13:37:24 +0800
Subject: [PATCH] feat: 1委托单 2下单详情 3检验任务 4检验任务复核 5检验任务详情 6标准维护 7检验单详情 8报告编制
---
basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java | 89 +++++++++++++++-----------------------------
1 files changed, 30 insertions(+), 59 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java
index 45851ec..70ea6a1 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java
@@ -2,18 +2,17 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
+import com.ruoyi.basic.service.*;
import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.basic.dto.AddStandardTreeNodeDto;
import com.ruoyi.basic.dto.CopyStandardProductListDto;
-import com.ruoyi.basic.dto.FactoryDto;
import com.ruoyi.basic.dto.InsSampleReceiveDto;
import com.ruoyi.basic.dto.ResetTreeDragDTO;
+import com.ruoyi.basic.dto.StandardLibraryTreeNodeDto;
+import com.ruoyi.basic.dto.UpdateStandardTreeNodeDto;
+import com.ruoyi.basic.dto.StandardTreeTemplateBindingDto;
import com.ruoyi.basic.pojo.StandardProductList;
import com.ruoyi.basic.pojo.StandardProductListSupplierAsk;
-import com.ruoyi.basic.pojo.StandardTree;
-import com.ruoyi.basic.service.StandardMethodListService;
-import com.ruoyi.basic.service.StandardProductListService;
-import com.ruoyi.basic.service.StandardProductListSupplierAskService;
-import com.ruoyi.basic.service.StandardTreeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -33,7 +32,7 @@
private StandardTreeService standardTreeService;
- private StandardMethodListService standardMethodListService;
+ private StandardMethodService standardMethodService;
private StandardProductListService standardProductListService;
@@ -53,14 +52,17 @@
@ApiOperation(value = "娣诲姞鏍囧噯鏍�")
@PostMapping("/addStandardTree")
- public Result addStandardTree(@RequestBody StandardTree standardTree) {
- return Result.success(standardTreeService.addStandardTree(standardTree));
+ public Result addStandardTree(@RequestBody AddStandardTreeNodeDto dto) {
+ return Result.success(standardTreeService.addStandardTree(dto));
}
@ApiOperation(value = "鏍规嵁鏍囧噯鏍戣繘琛屾爣鍑嗘煡璇�")
@GetMapping("/selectsStandardMethodByFLSSM")
public Result selectsStandardMethodByFLSSM(String tree) {
- return Result.success(standardMethodListService.selectsStandardMethodByFLSSM(tree));
+ if (tree == null || tree.trim().isEmpty()) {
+ return Result.fail("鏍囧噯鏍戝弬鏁颁笉鑳戒负绌�");
+ }
+ return Result.success(standardMethodService.selectsStandardMethodByFLSSM(tree));
}
@ApiOperation(value = "淇敼鏍囧噯搴撲腑鐨勫唴瀹�")
@@ -93,8 +95,8 @@
@ApiOperation(value = "閫氳繃妫�楠屾爣鍑嗘煡璇㈡楠岄」鐩�")
@GetMapping("/selectStandardProductListByMethodId")
- public Result selectStandardProductListByMethodId(Integer id, String tree) {
- return Result.success(standardProductListService.selectStandardProductListByMethodId(id, tree));
+ public Result selectStandardProductListByMethodId(Integer id, String tree, Integer page, String keyword) {
+ return Result.success(standardProductListService.selectStandardProductListByMethodId(id, tree, page, keyword));
}
@ApiOperation(value = "鎵归噺鏌ヨ妫�楠岄」鐩�")
@@ -112,7 +114,7 @@
@ApiOperation(value = "鑾峰彇鏍囧噯鏍戜笅鏍囧噯鏂规硶鏋氫妇")
@GetMapping("/selectStandardMethodEnum")
public Result selectStandardMethodEnum() {
- return Result.success(standardMethodListService.selectStandardMethodEnum());
+ return Result.success(standardMethodService.selectStandardMethodEnum());
}
@ApiOperation(value = "鑾峰彇浜у搧鏋舵瀯")
@@ -131,49 +133,6 @@
return Result.success(standardTreeService.upStandardProducts(product));
}
- @ApiOperation("浠呰幏鍙栧厜绾ょ殑鍨嬪彿")
- @GetMapping("/getStandTreeBySampleType")
- public Result<?> getStandTreeBySampleType(String laboratory, String sampleType) {
- return Result.success(standardTreeService.getStandTreeBySampleType(laboratory, sampleType));
- }
-
- @ApiOperation("瀵煎叆鏍囧噯搴�")
- @PostMapping("/inExcelOfTree/{isEquipment}")
- public Result inExcelOfTree(@RequestParam("file") MultipartFile file, @PathVariable("isEquipment") Boolean isEquipment) {
- if (!isEquipment) {
- standardTreeService.inExcelOfTree(file);
- } else {
- standardTreeService.importWorkstationExcel(file);
- }
- return Result.success();
- }
-
- @ApiOperation("閲嶇疆鏍囧噯搴撳崟浠�")
- @PostMapping("/resetTreeOfPrice")
- public Result resetTreeOfPrice(@RequestBody Map<String, Object> map) {
- String tree = (String) map.get("tree");
- Integer standardId = (Integer) map.get("standardId");
- standardTreeService.resetTreeOfPrice(tree, standardId);
- return Result.success();
- }
-
- @ApiOperation("閲嶇疆鏍囧噯搴撳伐鏃剁郴鏁�")
- @PostMapping("/resetTreeOfHour")
- public Result resetTreeOfHour(@RequestBody Map<String, Object> map) {
- String tree = (String) map.get("tree");
- Integer standardId = (Integer) map.get("standardId");
- standardTreeService.resetTreeOfHour(tree, standardId);
- return Result.success();
- }
-
- @ApiOperation("閲嶇疆鏍囧噯搴撹姹傛弿杩板拰瑕佹眰鍊�")
- @PostMapping("/resetTreeOfAsk")
- public Result resetTreeOfAsk(@RequestBody Map<String, Object> map) {
- String tree = (String) map.get("tree");
- Integer standardId = (Integer) map.get("standardId");
- standardTreeService.resetTreeOfAsk(tree, standardId);
- return Result.success();
- }
@ApiOperation("鏍囧噯搴撴嫋鎷�")
@PostMapping("/resetTreeDrag")
@@ -192,7 +151,7 @@
@ApiOperation(value = "鏍囧噯鏍戞帓搴�")
@PostMapping("/updateTreeSort")
- public Result updateTreeSort(@RequestBody List<FactoryDto> list) {
+ public Result updateTreeSort(@RequestBody List<StandardLibraryTreeNodeDto> list) {
return Result.success(standardTreeService.updateTreeSort(list));
}
@@ -230,8 +189,20 @@
@ApiOperation(value = "淇敼鏍囧噯鏍�")
@PostMapping("/updateStandardTree")
- public Result updateStandardTree(@RequestBody StandardTree standardTree) {
- return Result.success(standardTreeService.updateStandardTree(standardTree));
+ public Result updateStandardTree(@RequestBody UpdateStandardTreeNodeDto dto) {
+ return Result.success(standardTreeService.updateStandardTree(dto));
+ }
+
+ @ApiOperation(value = "鏌ヨ鏍囧噯缁戝畾鐨勫師濮嬭褰曟ā鏉�")
+ @GetMapping("/selectTemplateBindings")
+ public Result selectTemplateBindings(Integer standardTreeId) {
+ return Result.success(standardTreeService.selectTemplateBindings(standardTreeId));
+ }
+
+ @ApiOperation(value = "淇濆瓨鏍囧噯缁戝畾鐨勫師濮嬭褰曟ā鏉�")
+ @PostMapping("/saveTemplateBindings")
+ public Result saveTemplateBindings(@RequestBody StandardTreeTemplateBindingDto dto) {
+ return Result.success(standardTreeService.saveTemplateBindings(dto));
}
@ApiOperation(value = "妫�楠岄」瑕佹眰鍊煎鍒跺姣�")
--
Gitblit v1.9.3