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

Merge branch 'master' of codeup.aliyun.com:6265f483e4166464dc2f9c14/boeu/baseservers

Browse Source
This commit is contained in:
dongruihua
2022-12-28 22:16:35 +08:00
parent 6feb96e347 cc45ec584c
commit a8773c46dc
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -283,7 +283,7 @@ public class CasesServiceImpl implements ICasesService {
query.addOrder(order);
query.setPageIndex(pageIndex);
query.setPageSize(pageSize);
query.addFields("new Cases(id,title,endTime,status,caseScope,views,comments,praises,shares,favorites)");
//query.addFields("new Cases(id,title,endTime,status,caseScope,views,comments,praises,shares,favorites)");
PageList<Cases> page = casesDao.findPage(query.builder());
return page;
}

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

@@ -29,9 +29,15 @@ public class ExamPaperDao extends BaseDao<ExamPaper> {
queryBuilder.addFilter(FieldFilters.eq("deleted",false));
queryBuilder.addOrder(order);
if(examPaperDto!=null){
if (StringUtils.isNotBlank(examPaperDto.getKeyWord())) {
queryBuilder.addFilter(FieldFilters.eq("testName",examPaperDto.getKeyWord()));
}
if (StringUtils.isNotBlank(examPaperDto.getResOwner1())) {
queryBuilder.addFilter(FieldFilters.eq("resOwner1",examPaperDto.getResOwner1()));
}
if (StringUtils.isNotBlank(examPaperDto.getResOwner2())) {
queryBuilder.addFilter(FieldFilters.eq("resOwner2", examPaperDto.getResOwner2()));
}

2
servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/ExamPaperServiceImpl.java
View File

@@ -42,7 +42,7 @@ public class ExamPaperServiceImpl implements IExamPaperService{
* */
@Override
public PageList<ExamPaper> queryList(int pageIndex,int pageSize,ExamPaperDto examPaperDto) {
PageList<ExamPaper> pageList = examPaperDao.queryList(pageIndex,pageSize, OrderCondition.desc("id"), examPaperDto);
PageList<ExamPaper> pageList = examPaperDao.queryList(pageIndex,pageSize, OrderCondition.desc("sysCreateTime"), examPaperDto);
return pageList;
}
/**