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> 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 ruleGroupList() { + List list = bomFactoryRuleGroupService.lambdaQuery().list(); + List childList = Convert.convert(new TypeReference>() { + }, list); + return childList; + } }