From ce10da906c58596fce43bffa6a6d177268ca177b Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 30 四月 2024 00:54:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java |   32 ++++++++++++++++++--------------
 1 files changed, 18 insertions(+), 14 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 761d92e..75cb990 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,10 +3,10 @@
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.yuanchu.mom.annotation.ValueAuth;
+import com.yuanchu.mom.annotation.ValueClassify;
 import com.yuanchu.mom.pojo.InsSample;
 import com.yuanchu.mom.pojo.StandardProductList;
 import com.yuanchu.mom.pojo.StandardTree;
-import com.yuanchu.mom.service.InsOrderService;
 import com.yuanchu.mom.service.StandardMethodListService;
 import com.yuanchu.mom.service.StandardProductListService;
 import com.yuanchu.mom.service.StandardTreeService;
@@ -25,22 +25,19 @@
     private StandardMethodListService standardMethodListService;
 
     private StandardProductListService standardProductListService;
-
-    private InsOrderService insOrderService;
-
+    @ValueClassify("鏍囧噯搴�")
     @ApiOperation(value = "鑾峰彇鏍囧噯鏍�")
     @GetMapping("/selectStandardTreeList")
     public Result selectStandardTreeList(){
         return Result.success(standardTreeService.selectStandardTreeList());
     }
-
+    @ValueClassify("鏍囧噯搴�")
     @ApiOperation(value = "娣诲姞鏍囧噯鏍�")
     @PostMapping("/addStandardTree")
     public Result addStandardTree(@RequestBody StandardTree standardTree){
-        if(standardTree.getModel().equals("")) standardTree.setModel(null);
         return Result.success(standardTreeService.addStandardTree(standardTree));
     }
-
+    @ValueClassify("鏍囧噯搴�")
     @ApiOperation(value = "缁欐爣鍑嗘爲娣诲姞妫�楠屾爣鍑�")
     @PostMapping("/addStandardMethodList")
     public Result addStandardMethodList(String tree, Integer standardId){
@@ -53,32 +50,32 @@
     public Result selectsStandardMethodByFLSSM(String tree){
         return Result.success(standardMethodListService.selectsStandardMethodByFLSSM(tree));
     }
-
+    @ValueClassify("鏍囧噯搴�")
     @ApiOperation(value = "淇敼鏍囧噯搴撲腑鐨勮姹傚��")
     @PostMapping("/upStandardProductList")
     public Result upStandardProductList(@RequestBody StandardProductList list){
         return Result.success(standardProductListService.upStandardProductList(list));
     }
-
+    @ValueClassify("鏍囧噯搴�")
     @ApiOperation(value = "鍒犻櫎鏍囧噯鏍戜笅鐨勬楠屾爣鍑�")
     @PostMapping("/delStandardMethodByFLSSM")
     public Result delStandardMethodByFLSSM(Integer id){
         return Result.success(standardMethodListService.delStandardMethodByFLSSM(id));
     }
-
+    @ValueClassify("鏍囧噯搴�")
     @ApiOperation(value = "鍒犻櫎鏍囧噯鏍戜笅鐨勬楠岄」鐩�")
     @PostMapping("/delStandardProductByIds")
     public Result delStandardProductByIds(String ids){
         JSONArray lists = JSON.parseArray(ids);
         return Result.success(standardProductListService.delStandardProduct(lists));
     }
-
+    @ValueClassify("鏍囧噯搴�")
     @ApiOperation(value = "鏂板鏍囧噯鏍戜笅鐨勬楠岄」鐩�")
     @PostMapping("/addStandardProduct")
     public Result addStandardProduct(String ids, String tree){
         return Result.success(standardTreeService.addStandardProduct(ids, tree));
     }
-
+    @ValueClassify("鏍囧噯搴�")
     @ApiOperation(value = "鍒犻櫎鏍囧噯鏍戠殑灞傜骇")
     @PostMapping("/delStandardTree")
     public Result delStandardTree(String tree){
@@ -95,8 +92,8 @@
     @ApiOperation(value = "閫氳繃妫�楠屾爣鍑嗘煡璇㈡楠岄」鐩�")
     @PostMapping("/selectStandardProductListByMethodId")
     @ValueAuth
-    public Result selectStandardProductListByMethodId(Integer id){
-        return Result.success(standardProductListService.selectStandardProductListByMethodId(id));
+    public Result selectStandardProductListByMethodId(Integer id, String tree){
+        return Result.success(standardProductListService.selectStandardProductListByMethodId(id, tree));
     }
 
     @ApiOperation(value = "鑾峰彇鏍囧噯鏍戜笅鏍囧噯鏂规硶鏋氫妇")
@@ -106,4 +103,11 @@
         return Result.success(standardMethodListService.selectStandardMethodEnum());
     }
 
+    @ApiOperation(value = "鑾峰彇浜у搧鏋舵瀯")
+    @GetMapping("/getStandardTree2")
+    @ValueAuth
+    public Result getStandardTree2(){
+        return Result.success(standardTreeService.getStandardTree2());
+    }
+
 }

--
Gitblit v1.9.3