FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_3' into 'develop_master'

Browse Source 
feat: 数据字典 查询问题

See merge request !2
This commit is contained in:
super_liu
2021-06-16 03:00:24 +00:00
parent cc7ee9bd83 a03db1068a
commit 827d59bb7b
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-sys/src/main/java/com/adc/da/sys/controller/DicEORestController.java
+7
View File
@@ -37,6 +37,13 @@ public class DicEORestController extends BaseController<DictionaryEO> {
public ResponseMessage<PageInfo<DictionaryEO>> page(DictionaryEOPage page) throws Exception { public ResponseMessage<PageInfo<DictionaryEO>> page(DictionaryEOPage page) throws Exception {
page.setDictionaryCodeOperator("like"); page.setDictionaryCodeOperator("like");
page.setDictionaryNameOperator("like"); page.setDictionaryNameOperator("like");
if(org.apache.commons.lang3.StringUtils.isNotBlank(page.getPaixu()) && org.apache.commons.lang3.StringUtils.isNotBlank(page.getShunxu())){
String sql = page.getPaixu()+" "+page.getShunxu();
page.setSql(sql);
}else{
String sql = "order_num,u0.id";
page.setSql(sql);
}
List<DictionaryEO> rows = dicEOService.queryAllDicByPage(page); List<DictionaryEO> rows = dicEOService.queryAllDicByPage(page);
return Result.success(getPageInfo(page.getPager(), rows)); return Result.success(getPageInfo(page.getPager(), rows));
} }
adc-da-sys/src/main/resources/mybatis/mapper/sys/DictionaryEOMapper.xml
+5 -4
View File
@@ -267,12 +267,13 @@
<!-- 查询TS_DICTIONARY列表 --> <!-- 查询TS_DICTIONARY列表 -->
<select id="queryAllDicByPage" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage"> <select id="queryAllDicByPage" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage">
select <include refid="Base_Column_List" /> from select <include refid="Base_Column_List" /> from
(select tmp_tb.* , rownum rn from (select tmp_tb.* from
(select <include refid="Base_Column_List" /> from TS_DICTIONARY u0 (select <include refid="Base_Column_List" /> from TS_DICTIONARY u0
<include refid="Base_Where_Clause"/> <include refid="Base_Where_Clause"/>
order by order_num,u0.id <if test="sql != null">
) tmp_tb where rownum &lt;= ${pager.endIndex}) ORDER BY ${sql}
where rn &gt;= ${pager.startIndex} </if>
) tmp_tb limit ${pager.startIndex-1},${pageSize}) a
</select> </select>
<select id="getDictionarySelList" parameterType="java.lang.String" resultType="com.adc.da.sys.common.SelectionResult"> <select id="getDictionarySelList" parameterType="java.lang.String" resultType="com.adc.da.sys.common.SelectionResult">