From 8577a11e5093871b2b5d6988431e7e22e76d43e6 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 29 四月 2024 01:46:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java
index c50d3a4..b6aa6d5 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.yuanchu.mom.annotation.ValueAuth;
+import com.yuanchu.mom.pojo.InsSample;
import com.yuanchu.mom.pojo.StandardProductList;
import com.yuanchu.mom.pojo.StandardTree;
import com.yuanchu.mom.service.StandardMethodListService;
@@ -33,7 +34,6 @@
@ApiOperation(value = "娣诲姞鏍囧噯鏍�")
@PostMapping("/addStandardTree")
public Result addStandardTree(@RequestBody StandardTree standardTree){
- if(standardTree.getModel().equals("")) standardTree.setModel(null);
return Result.success(standardTreeService.addStandardTree(standardTree));
}
@@ -81,4 +81,32 @@
return Result.success(standardTreeService.delStandardTree(tree));
}
+ @ApiOperation(value = "閫氳繃鏍囧噯鏍戞煡璇㈠搴旂殑妫�楠岄」鐩�")
+ @PostMapping("/selectStandardProductList")
+ @ValueAuth
+ public Result selectStandardProductList(@RequestBody InsSample insSample){
+ return Result.success(standardProductListService.selectStandardProductList(insSample));
+ }
+
+ @ApiOperation(value = "閫氳繃妫�楠屾爣鍑嗘煡璇㈡楠岄」鐩�")
+ @PostMapping("/selectStandardProductListByMethodId")
+ @ValueAuth
+ public Result selectStandardProductListByMethodId(Integer id, String tree){
+ return Result.success(standardProductListService.selectStandardProductListByMethodId(id, tree));
+ }
+
+ @ApiOperation(value = "鑾峰彇鏍囧噯鏍戜笅鏍囧噯鏂规硶鏋氫妇")
+ @GetMapping("/selectStandardMethodEnum")
+ @ValueAuth
+ public Result selectStandardMethodEnum(){
+ return Result.success(standardMethodListService.selectStandardMethodEnum());
+ }
+
+ @ApiOperation(value = "鑾峰彇浜у搧鏋舵瀯")
+ @GetMapping("/getStandardTree2")
+ @ValueAuth
+ public Result getStandardTree2(){
+ return Result.success(standardTreeService.getStandardTree2());
+ }
+
}
--
Gitblit v1.9.3