diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaPropInfoController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaPropInfoController.java index 8fec177b..f33a8576 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaPropInfoController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaPropInfoController.java @@ -64,9 +64,9 @@ public class MaPropInfoController extends BaseController { */ @GetMapping("/lists") @ApiOperation(value = "查询资产属性列表") - public TableDataInfo list() + public TableDataInfo list(String bindingName) { - List list = maPropInfoService.selectMaPropInfoLists(); + List list = maPropInfoService.selectMaPropInfoLists(bindingName); return getDataTable(list); } /** @@ -75,9 +75,9 @@ public class MaPropInfoController extends BaseController { */ @ApiOperation(value = "根据类型名称查询类型") @GetMapping("/getMaTypeList") - public TableDataInfo getMaTypeList(){ + public TableDataInfo getMaTypeList(String typeName){ startPage(); - List maTypeList = maPropInfoService.selectMaType(); + List maTypeList = maPropInfoService.selectMaType(typeName); return getDataTable(maTypeList); } /** diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaPropInfoMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaPropInfoMapper.java index 84ed6b0c..ccc40421 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaPropInfoMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaPropInfoMapper.java @@ -27,7 +27,7 @@ public interface MaPropInfoMapper { * @param * @return */ - List selectMaPropSets(); + List selectMaPropSets(String bindingName); /** * 校验资产项目名称唯一性 * @param propName @@ -56,7 +56,7 @@ public interface MaPropInfoMapper { * @return */ List checkPropIdUnique(MaPropSet maPropSet); - List selectMaType(); + List selectMaType(String typeName); /** * 删除资产项目 * @param propId diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/IMaPropInfoService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/IMaPropInfoService.java index 34fceca6..1f1aeb09 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/IMaPropInfoService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/IMaPropInfoService.java @@ -25,13 +25,13 @@ public interface IMaPropInfoService { * @param * @return */ - List selectMaPropInfoLists(); + List selectMaPropInfoLists(String bindingName); /** * 查询资产属性列表 * @param * @return */ - List selectMaType(); + List selectMaType(String typeName); /** * 校验资产项目名称唯一性 * @param maPropInfo diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaPropInfoServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaPropInfoServiceImpl.java index b9d7413d..dedbffcb 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaPropInfoServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaPropInfoServiceImpl.java @@ -51,8 +51,8 @@ public class MaPropInfoServiceImpl implements IMaPropInfoService { * @return */ @Override - public List selectMaPropInfoLists() { - return maPropInfoMapper.selectMaPropSets(); + public List selectMaPropInfoLists(String bindingName) { + return maPropInfoMapper.selectMaPropSets(bindingName); } /** * 查询资产属性列表 @@ -60,8 +60,8 @@ public class MaPropInfoServiceImpl implements IMaPropInfoService { * @return */ @Override - public List selectMaType() { - return maPropInfoMapper.selectMaType(); + public List selectMaType(String typeName) { + return maPropInfoMapper.selectMaType(typeName); } /** diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaPropInfoMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaPropInfoMapper.xml index 2f00bfe0..f7c43b8a 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaPropInfoMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaPropInfoMapper.xml @@ -217,8 +217,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select prop_id, prop_name from ma_prop_info del_flag = '0' - - AND a.prop_name like concat('%', #{propName}, '%') + + AND prop_name like concat('%', #{bindingName}, '%')