bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

This commit is contained in:
gmhao 2023-12-19 01:38:17 +08:00
parent e5b6e555e5
commit d435d728e7
10 changed files with 60 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaPropInfoController.java
View File

@ -46,15 +46,15 @@ public class MaPropInfoController extends BaseController {
/**
* 查询资产属性列表
* @param propName
* @param maPropInfo
* @return
*/
@GetMapping("/list")
@ApiOperation(value = "查询资产属性列表")
public TableDataInfo list(String propName)
public TableDataInfo list(MaPropInfo maPropInfo)
{
startPage();
List<MaPropInfo> list = maPropInfoService.selectMaPropInfoList(propName);
List<MaPropInfo> list = maPropInfoService.selectMaPropInfoList(maPropInfo);
return getDataTable(list);
}
/**
@ -162,9 +162,9 @@ public class MaPropInfoController extends BaseController {
@PostMapping("/export")
public void export(HttpServletResponse response, String propName)
{
List<MaPropInfo> list = maPropInfoService.selectMaPropInfoList(propName);
ExcelUtil<MaPropInfo> util = new ExcelUtil<MaPropInfo>(MaPropInfo.class);
util.exportExcel(response, list, "资产属性类型数据");
// List<MaPropInfo> list = maPropInfoService.selectMaPropInfoList(propName);
// ExcelUtil<MaPropInfo> util = new ExcelUtil<MaPropInfo>(MaPropInfo.class);
// util.exportExcel(response, list, "资产属性类型数据");
}
/**

11
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/SysDicController.java
View File

@ -48,6 +48,17 @@ public class SysDicController extends BaseController
List<SysDic> list = sysDicService.selectSysDicList(sysDic);
return getDataTable(list);
}
/**
* 查询数据字典列表id
*/
@ApiOperation(value = "查询数据字典列表id")
@GetMapping("/listId")
public TableDataInfo listid(SysDic sysDic)
{
startPage();
List<SysDic> list = sysDicService.selectSysDic(sysDic);
return getDataTable(list);
}
/**
* 查询父类数据字典列表
*/

4
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaPropInfoMapper.java
View File

@ -16,10 +16,10 @@ public interface MaPropInfoMapper {
/**
* 根据资产名称查询资产属性列表
* @param propName
* @param maPropInfo
* @return
*/
List<MaPropInfo> selectMaPropSet(String propName);
List<MaPropInfo> selectMaPropSet(MaPropInfo maPropInfo);
/**
* 根据资产名称查询资产名称列表
* @param

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/SysDicMapper.java
View File

@ -28,7 +28,9 @@ public interface SysDicMapper
* @return 数据字典集合
*/
public List<SysDic> selectSysDicList(SysDic sysDic);
public List<SysDic> selectSysDic(SysDic sysDic);
/**
*
* 查询父类数据字典列表
*
* @param sysDic 数据字典

4
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/IMaPropInfoService.java
View File

@ -16,10 +16,10 @@ public interface IMaPropInfoService {
/**
* 查询资产属性列表
* @param propName
* @param maPropInfo
* @return
*/
List<MaPropInfo> selectMaPropInfoList(String propName);
List<MaPropInfo> selectMaPropInfoList(MaPropInfo maPropInfo);
/**
* 查询资产属性列表
* @param

7
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/ISysDicService.java
View File

@ -28,6 +28,13 @@ public interface ISysDicService
* @return 数据字典集合
*/
public List<SysDic> selectSysDicList(SysDic sysDic);
/**
* 查询数据字典列表
*
* @param sysDic 数据字典
* @return 数据字典集合
*/
public List<SysDic> selectSysDic(SysDic sysDic);
/**
* 查询父类数据字典列表
*

4
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaPropInfoServiceImpl.java
View File

@ -38,8 +38,8 @@ public class MaPropInfoServiceImpl implements IMaPropInfoService {
* @return
*/
@Override
public List<MaPropInfo> selectMaPropInfoList(String propName) {
return maPropInfoMapper.selectMaPropSet(propName);
public List<MaPropInfo> selectMaPropInfoList(MaPropInfo maPropInfo) {
return maPropInfoMapper.selectMaPropSet(maPropInfo);
}
/**
* 查询资产属性列表

11
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/SysDicServiceImpl.java
View File

@ -46,6 +46,17 @@ public class SysDicServiceImpl implements ISysDicService
{
return sysDicMapper.selectSysDicList(sysDic);
}
/**
* 查询数据字典列表id
*
* @param sysDic 数据字典
* @return 数据字典
*/
@Override
public List<SysDic> selectSysDic(SysDic sysDic)
{
return sysDicMapper.selectSysDic(sysDic);
}
/**
* 查询父类数据字典列表
*

3
sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaPropInfoMapper.xml
View File

@ -180,6 +180,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="propName != null and propName != ''">
AND a.prop_name like concat('%', #{propName}, '%')
</if>
<if test="propId != null and propId != ''">
AND a.prop_id = #{propId}
</if>
</where>
</select>
<select id="selectMaPropSets" resultType="com.bonus.sgzb.base.domain.MaPropInfo" resultMap="MaPropInfoResult">

14
sgzb-modules/sgzb-base/src/main/resources/mapper/base/SysDicMapper.xml
View File

@ -31,6 +31,20 @@
<if test="creator != null and creator != ''"> and creator = #{creator}</if>
</where>
</select>
<select id="selectSysDic" parameterType="com.bonus.sgzb.base.api.domain.SysDic" resultMap="SysDicResult">
<include refid="selectSysDicVo"/>
<where>
id = #{id}
<if test="code != null and code != ''"> and code = #{code}</if>
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
<if test="description != null and description != ''"> and description = #{description}</if>
<if test="value != null and value != ''"> and value = #{value}</if>
<if test="sort != null and sort != ''"> and sort = #{sort}</if>
<if test="level != null and level != ''"> and level = #{level}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="creator != null and creator != ''"> and creator = #{creator}</if>
</where>
</select>
<select id="selectSysDicLists" parameterType="com.bonus.sgzb.base.api.domain.SysDic" resultMap="SysDicResult">
<include refid="selectSysDicVo"/>
<where>