ToolTech/tool-tech
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v1.0' into v1.0

Browse Source
This commit is contained in:
pan 2024-08-31 16:11:30 +08:00
commit 2561546ac2
5 changed files with 63 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tool-tech-admin/src/main/java/com/rzdata/web/controller/system/SysDictTypeController.java
View File

@ -43,6 +43,16 @@ public class SysDictTypeController extends BaseController
return getDataTable(list);
}
@PreAuthorize("@ss.hasPermi('system:bizlist:list')")
@GetMapping("/bizlist")
public TableDataInfo bizlist(SysDictType dictType)
{
startPage();
List<SysDictType> list = dictTypeService.selectBizDictTypeList(dictType);
return getDataTable(list);
}
@Log(title = "字典类型", businessType = BusinessType.EXPORT)
@PreAuthorize("@ss.hasPermi('system:dict:export')")
@PostMapping("/export")

8
tool-tech-system/src/main/java/com/rzdata/system/mapper/SysDictTypeMapper.java
View File

@ -18,6 +18,14 @@ public interface SysDictTypeMapper
*/
public List<SysDictType> selectDictTypeList(SysDictType dictType);
/**
* 根据条件分页查询字典类型
*
* @param dictType 字典类型信息
* @return 字典类型集合信息
*/
public List<SysDictType> selectBizDictTypeList(SysDictType dictType);
/**
* 根据所有字典类型
*

8
tool-tech-system/src/main/java/com/rzdata/system/service/ISysDictTypeService.java
View File

@ -19,6 +19,14 @@ public interface ISysDictTypeService
*/
public List<SysDictType> selectDictTypeList(SysDictType dictType);
/**
* 根据条件分页查询字典类型
*
* @param dictType 字典类型信息
* @return 字典类型集合信息
*/
public List<SysDictType> selectBizDictTypeList(SysDictType dictType);
/**
* 根据所有字典类型
*

12
tool-tech-system/src/main/java/com/rzdata/system/service/impl/SysDictTypeServiceImpl.java
View File

@ -53,6 +53,18 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
return dictTypeMapper.selectDictTypeList(dictType);
}
/**
* 根据条件分页查询字典类型
*
* @param dictType 字典类型信息
* @return 字典类型集合信息
*/
@Override
public List<SysDictType> selectBizDictTypeList(SysDictType dictType)
{
return dictTypeMapper.selectBizDictTypeList(dictType);
}
/**
* 根据所有字典类型
*

25
tool-tech-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
View File

@ -40,6 +40,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if>
</where>
</select>
<!-- 业务字典查询方法-->
<select id="selectBizDictTypeList" parameterType="SysDictType" resultMap="SysDictTypeResult">
<include refid="selectDictTypeVo"/>
<where>
<if test="dictName != null and dictName != ''">
AND dict_name like concat('%', #{dictName}, '%')
</if>
<if test="status != null and status != ''">
AND status = #{status}
</if>
<if test="dictType != null and dictType != ''">
AND dict_type like concat('%', #{dictType}, '%')
</if>
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
and date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
</if>
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
and date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
</if>
<!-- 锁定某些字段类型 -->
AND dict_type in ('tool_type','msg_status','tool_source','tool_status','doc_class','doc_source','doc_upload_status','flow_status')
</where>
</select>
<select id="selectDictTypeAll" resultMap="SysDictTypeResult">
<include refid="selectDictTypeVo"/>