From 8f7ec3aacb05c539fd9ed9db7702133adc57b8f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?= Date: Mon, 9 Mar 2026 17:10:26 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=AF=E5=88=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/base/controller/PropertiesController.java | 8 ++++++++ .../java/com/xujie/modules/base/dao/PropertiesMapper.java | 3 +++ .../modules/base/service/Impl/PropertiesServiceImpl.java | 6 ++++++ .../com/xujie/modules/base/service/PropertiesService.java | 3 +++ src/main/resources/mapper/base/PropertiesMapper.xml | 8 ++++++++ 5 files changed, 28 insertions(+) diff --git a/src/main/java/com/xujie/modules/base/controller/PropertiesController.java b/src/main/java/com/xujie/modules/base/controller/PropertiesController.java index 276a353..de441e6 100644 --- a/src/main/java/com/xujie/modules/base/controller/PropertiesController.java +++ b/src/main/java/com/xujie/modules/base/controller/PropertiesController.java @@ -12,6 +12,7 @@ import com.xujie.modules.base.service.PlmPropertiesItemService; import com.xujie.modules.base.service.PropertiesService; import com.xujie.modules.sys.controller.AbstractController; import com.xujie.modules.sys.entity.DictData; +import com.xujie.modules.sys.entity.SysMenuEntity; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; @@ -340,6 +341,13 @@ public class PropertiesController extends AbstractController { return R.ok(); } + @PostMapping("/menu/list") + @ResponseBody + public R searchMenuAllListId(@RequestBody PlmPropertiesModelHeader properties){ + List list = propertiesService.searchMenuAllListId(properties); + return R.ok().put("rows",list); + } + @PostMapping("/item/type/list") @ResponseBody public R searchAllItemTypeList(@RequestBody PlmPropertiesItem propertiesItem){ diff --git a/src/main/java/com/xujie/modules/base/dao/PropertiesMapper.java b/src/main/java/com/xujie/modules/base/dao/PropertiesMapper.java index 3f891e4..10de396 100644 --- a/src/main/java/com/xujie/modules/base/dao/PropertiesMapper.java +++ b/src/main/java/com/xujie/modules/base/dao/PropertiesMapper.java @@ -7,6 +7,7 @@ import com.xujie.modules.base.data.*; import com.xujie.modules.base.entity.*; import com.xujie.modules.sys.entity.DictData; +import com.xujie.modules.sys.entity.SysMenuEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -243,6 +244,8 @@ public interface PropertiesMapper extends BaseMapper { void updatePlmPropertiesModelDetailOrder(PlmPropertiesModelDetail data); + List searchMenuAllListId(@Param("site") String site); + List searchAllItemTypeList(PlmPropertiesItem propertiesItem); List> searchAllTypeList(); diff --git a/src/main/java/com/xujie/modules/base/service/Impl/PropertiesServiceImpl.java b/src/main/java/com/xujie/modules/base/service/Impl/PropertiesServiceImpl.java index 0b318f4..95bbee4 100644 --- a/src/main/java/com/xujie/modules/base/service/Impl/PropertiesServiceImpl.java +++ b/src/main/java/com/xujie/modules/base/service/Impl/PropertiesServiceImpl.java @@ -18,6 +18,7 @@ import com.xujie.modules.base.service.PropertiesService; import com.xujie.modules.sys.dao.SysUserDao; import com.xujie.modules.sys.entity.DictData; +import com.xujie.modules.sys.entity.SysMenuEntity; import com.xujie.modules.sys.entity.SysUserEntity; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -285,6 +286,11 @@ public class PropertiesServiceImpl implements PropertiesService { return propertiesMapper.searchAllTypeList(); } + @Override + public List searchMenuAllListId(PlmPropertiesModelHeader properties) { + return propertiesMapper.searchMenuAllListId(properties.getSite()); + } + @Override public List getItemListsForPartAndCode(PlmPropertiesModelHeaderData inData){ return propertiesMapper.getItemListsForPartAndCode(inData); diff --git a/src/main/java/com/xujie/modules/base/service/PropertiesService.java b/src/main/java/com/xujie/modules/base/service/PropertiesService.java index 9976d6a..75293b6 100644 --- a/src/main/java/com/xujie/modules/base/service/PropertiesService.java +++ b/src/main/java/com/xujie/modules/base/service/PropertiesService.java @@ -6,6 +6,7 @@ import com.xujie.modules.base.data.*; import com.xujie.modules.base.entity.*; import com.xujie.modules.sys.entity.DictData; +import com.xujie.modules.sys.entity.SysMenuEntity; import java.util.List; import java.util.Map; @@ -219,6 +220,8 @@ public interface PropertiesService { + List searchMenuAllListId(PlmPropertiesModelHeader properties); + List searchAllItemTypeList(PlmPropertiesItem propertiesItem); List> searchAllTypeList(); diff --git a/src/main/resources/mapper/base/PropertiesMapper.xml b/src/main/resources/mapper/base/PropertiesMapper.xml index c56ee59..8aa5ee9 100644 --- a/src/main/resources/mapper/base/PropertiesMapper.xml +++ b/src/main/resources/mapper/base/PropertiesMapper.xml @@ -415,6 +415,14 @@ from properties_type + +