hz/java-servers
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git synced 2025-12-10 11:26:50 +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 13:21:34 +08:00
parent 2d223c5f1f bedc922585
commit d976e37bc5
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -310,12 +310,14 @@ public class CasesServiceImpl implements ICasesService {
filters.add(FieldFilters.eq("excellent", caseVo.getExcellent()));
}
OrderCondition order = null;
if (StringUtils.isNotBlank(caseVo.getOrderField())) {
if (caseVo.getOrderAsc() == null || caseVo.getOrderAsc()) {
if (StringUtils.isNotBlank(caseVo.getOrderField()) && caseVo.getOrderAsc() != null) {
if (caseVo.getOrderAsc()) {
order = OrderCondition.asc(caseVo.getOrderField());
} else {
order = OrderCondition.desc(caseVo.getOrderField());
}
} else {
order = OrderCondition.desc("sysCreateTime");
}
if(Objects.nonNull(order)) {