From be0163dd353a3214e64472e28a710bfb79a1d637 Mon Sep 17 00:00:00 2001 From: daihh Date: Wed, 28 Dec 2022 21:50:33 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=AF=BE=E4=BB=B6=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/xboe/module/exam/dao/ExamPaperDao.java | 6 ++++++ .../xboe/module/exam/service/impl/ExamPaperServiceImpl.java | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/exam/dao/ExamPaperDao.java b/servers/boe-server-all/src/main/java/com/xboe/module/exam/dao/ExamPaperDao.java index 6c01ffeb..e122cf87 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/dao/ExamPaperDao.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/dao/ExamPaperDao.java @@ -29,9 +29,15 @@ public class ExamPaperDao extends BaseDao { 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())); } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/ExamPaperServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/ExamPaperServiceImpl.java index 2dd6f13f..3cb055cb 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/ExamPaperServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/ExamPaperServiceImpl.java @@ -42,7 +42,7 @@ public class ExamPaperServiceImpl implements IExamPaperService{ * */ @Override public PageList queryList(int pageIndex,int pageSize,ExamPaperDto examPaperDto) { - PageList pageList = examPaperDao.queryList(pageIndex,pageSize, OrderCondition.desc("id"), examPaperDto); + PageList pageList = examPaperDao.queryList(pageIndex,pageSize, OrderCondition.desc("sysCreateTime"), examPaperDto); return pageList; } /** From cc45ec584cd0385dc5fb20d551f898ed2dab6e58 Mon Sep 17 00:00:00 2001 From: daihh Date: Wed, 28 Dec 2022 22:03:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=A1=88=E4=BE=8B?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/module/boecase/service/impl/CasesServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java index 4005e745..c3533414 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java @@ -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 page = casesDao.findPage(query.builder()); return page; }