From 860e5e9aa41f668814b165ce99196ac8817addb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Sat, 24 Feb 2024 13:58:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E5=88=99=E5=88=86=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bomnew/api/user/BomFactorySplitRuleApi.java       | 11 +++++++----
 .../bomnew/service/BomFactorySplitRuleService.java    | 10 ++++++++++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomFactorySplitRuleApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomFactorySplitRuleApi.java
index b94c7db0..3039b6c9 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomFactorySplitRuleApi.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomFactorySplitRuleApi.java
@@ -3,14 +3,12 @@ package com.nflg.product.bomnew.api.user;
 import com.nflg.product.base.core.api.BaseApi;
 import com.nflg.product.bomnew.pojo.dto.BomFactorySplitRuleDTO;
 import com.nflg.product.bomnew.pojo.dto.BomPDTO;
+import com.nflg.product.bomnew.pojo.vo.BomFactoryRuleGroupSimpleVO;
 import com.nflg.product.bomnew.pojo.vo.BomFactorySplitRuleVO;
 import com.nflg.product.bomnew.service.BomFactorySplitRuleService;
 import io.swagger.annotations.Api;
 import nflg.product.common.vo.ResultVO;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
@@ -77,5 +75,10 @@ public class BomFactorySplitRuleApi extends BaseApi {
         return bomFactorySplitRuleService.createOrUpdate(requestList);
     }
 
+    @GetMapping("ruleGroupList")
+    public ResultVO<List<BomFactoryRuleGroupSimpleVO>> ruleGroupList() {
+        return ResultVO.success(bomFactorySplitRuleService.ruleGroupList()) ;
+    }
+
 }
 
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomFactorySplitRuleService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomFactorySplitRuleService.java
index b01c6d68..5a849d75 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomFactorySplitRuleService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomFactorySplitRuleService.java
@@ -21,6 +21,7 @@ import com.nflg.product.bomnew.pojo.entity.BomFactoryRuleGroupEntity;
 import com.nflg.product.bomnew.pojo.entity.BomFactorySplitRuleEntity;
 
 import com.nflg.product.bomnew.pojo.entity.MaterialCategoryEntity;
+import com.nflg.product.bomnew.pojo.vo.BomFactoryRuleGroupSimpleVO;
 import com.nflg.product.bomnew.pojo.vo.BomFactorySplitRuleExcelVO;
 import com.nflg.product.bomnew.pojo.vo.BomFactorySplitRuleVO;
 import com.nflg.product.bomnew.util.EecExcelUtil;
@@ -478,5 +479,14 @@ public class BomFactorySplitRuleService extends ServiceImpl<BomFactorySplitRuleM
         updateWrapper.lambda().set(BomFactorySplitRuleEntity::getUpdatedTime, new Date());
         this.update(updateWrapper);
     }
+
+
+
+    public List<BomFactoryRuleGroupSimpleVO> ruleGroupList() {
+        List<BomFactoryRuleGroupEntity> list = bomFactoryRuleGroupService.lambdaQuery().list();
+        List<BomFactoryRuleGroupSimpleVO> childList = Convert.convert(new TypeReference<List<BomFactoryRuleGroupSimpleVO>>() {
+        }, list);
+        return childList;
+    }
 }