hz/java-servers
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git synced 2025-12-07 09:56:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/zcwy0813-yang' into dev0525

Browse Source
This commit is contained in:
yang
2024-09-10 14:02:56 +08:00
parent e60e110ab4 1fbf56dec3
commit f049759428
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRecordDao.java
View File

@@ -55,8 +55,7 @@ public interface CasesRecordDao extends JpaRepository<Cases, String>, JpaSpecifi
" IF(:#{#condition.orderField}='views' and :#{#condition.orderAsc}=true,c.views, null) asc," +
" IF(:#{#condition.orderField}='views' and :#{#condition.orderAsc}=false,c.views, null) desc," +
" IF(:#{#condition.orderField}='sysCreateTime' and :#{#condition.orderAsc}=true ,c.sys_create_time,null) asc," +
" IF(:#{#condition.orderField}='sysCreateTime' and :#{#condition.orderAsc}=false , c.sys_create_time,null) desc ," +
" IF(:#{#condition.orderField}='views' or :#{#condition.orderField}!='sysCreateTime' , c.sys_create_time , null) desc",
" IF(:#{#condition.orderField}='sysCreateTime' and :#{#condition.orderAsc}=false , c.sys_create_time,null) desc",
countQuery =
" SELECT count(*) FROM ( " +
" SELECT b.* " +
@@ -91,8 +90,7 @@ public interface CasesRecordDao extends JpaRepository<Cases, String>, JpaSpecifi
" IF(:#{#condition.orderField}='views' and :#{#condition.orderAsc}=true,c.views, null) asc," +
" IF(:#{#condition.orderField}='views' and :#{#condition.orderAsc}=false,c.views, null) desc," +
" IF(:#{#condition.orderField}='sysCreateTime' and :#{#condition.orderAsc}=true ,c.sys_create_time,null) asc," +
" IF(:#{#condition.orderField}='sysCreateTime' and :#{#condition.orderAsc}=false , c.sys_create_time,null) desc," +
" IF(:#{#condition.orderField}!='views' or :#{#condition.orderField}!='sysCreateTime' , c.sys_create_time , null) desc"
" IF(:#{#condition.orderField}='sysCreateTime' and :#{#condition.orderAsc}=false , c.sys_create_time,null) desc"
)
Page<Cases> queryList(Pageable pageable, @Param("condition") CasePageVo casePage);

5
servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java
View File

@@ -385,6 +385,11 @@ public class CasesServiceImpl implements ICasesService {
caseVo.setOrg2(level2);
caseVo.setOrg3(level3);
if (StringUtils.isBlank(caseVo.getOrderField()) || caseVo.getOrderAsc()==null || (!"sysCreateTime".equals(caseVo.getOrderField()) && !"views".equals(caseVo.getOrderField()))){
caseVo.setOrderField("sysCreateTime");
caseVo.setOrderAsc(false);
}
Page<Cases> cases = casesRecordDao.queryList(pageRequest,caseVo);
PageList<Cases> pageList = new PageList<>();
pageList.setCount((int) cases.getTotalElements());