功能完善
This commit is contained in:
parent
a3dcf55260
commit
cd2e8b32d9
|
|
@ -64,9 +64,9 @@ public class MaPropInfoController extends BaseController {
|
|||
*/
|
||||
@GetMapping("/lists")
|
||||
@ApiOperation(value = "查询资产属性列表")
|
||||
public TableDataInfo list()
|
||||
public TableDataInfo list(String bindingName)
|
||||
{
|
||||
List<MaPropInfo> list = maPropInfoService.selectMaPropInfoLists();
|
||||
List<MaPropInfo> 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<MaType> maTypeList = maPropInfoService.selectMaType();
|
||||
List<MaType> maTypeList = maPropInfoService.selectMaType(typeName);
|
||||
return getDataTable(maTypeList);
|
||||
}
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ public interface MaPropInfoMapper {
|
|||
* @param
|
||||
* @return
|
||||
*/
|
||||
List<MaPropInfo> selectMaPropSets();
|
||||
List<MaPropInfo> selectMaPropSets(String bindingName);
|
||||
/**
|
||||
* 校验资产项目名称唯一性
|
||||
* @param propName
|
||||
|
|
@ -56,7 +56,7 @@ public interface MaPropInfoMapper {
|
|||
* @return
|
||||
*/
|
||||
List<MaPropSet> checkPropIdUnique(MaPropSet maPropSet);
|
||||
List<MaType> selectMaType();
|
||||
List<MaType> selectMaType(String typeName);
|
||||
/**
|
||||
* 删除资产项目
|
||||
* @param propId
|
||||
|
|
|
|||
|
|
@ -25,13 +25,13 @@ public interface IMaPropInfoService {
|
|||
* @param
|
||||
* @return
|
||||
*/
|
||||
List<MaPropInfo> selectMaPropInfoLists();
|
||||
List<MaPropInfo> selectMaPropInfoLists(String bindingName);
|
||||
/**
|
||||
* 查询资产属性列表
|
||||
* @param
|
||||
* @return
|
||||
*/
|
||||
List<MaType> selectMaType();
|
||||
List<MaType> selectMaType(String typeName);
|
||||
/**
|
||||
* 校验资产项目名称唯一性
|
||||
* @param maPropInfo
|
||||
|
|
|
|||
|
|
@ -51,8 +51,8 @@ public class MaPropInfoServiceImpl implements IMaPropInfoService {
|
|||
* @return
|
||||
*/
|
||||
@Override
|
||||
public List<MaPropInfo> selectMaPropInfoLists() {
|
||||
return maPropInfoMapper.selectMaPropSets();
|
||||
public List<MaPropInfo> selectMaPropInfoLists(String bindingName) {
|
||||
return maPropInfoMapper.selectMaPropSets(bindingName);
|
||||
}
|
||||
/**
|
||||
* 查询资产属性列表
|
||||
|
|
@ -60,8 +60,8 @@ public class MaPropInfoServiceImpl implements IMaPropInfoService {
|
|||
* @return
|
||||
*/
|
||||
@Override
|
||||
public List<MaType> selectMaType() {
|
||||
return maPropInfoMapper.selectMaType();
|
||||
public List<MaType> selectMaType(String typeName) {
|
||||
return maPropInfoMapper.selectMaType(typeName);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -217,8 +217,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
select prop_id, prop_name
|
||||
from ma_prop_info
|
||||
<where> del_flag = '0'
|
||||
<if test="propName != null and propName != ''">
|
||||
AND a.prop_name like concat('%', #{propName}, '%')
|
||||
<if test="bindingName != null and bindingName != ''">
|
||||
AND prop_name like concat('%', #{bindingName}, '%')
|
||||
</if>
|
||||
</where>
|
||||
</select>
|
||||
|
|
|
|||
Loading…
Reference in New Issue