From 3c417f4b4d6b1c0d0c65f8ce36d40c4c212ea7ce Mon Sep 17 00:00:00 2001 From: 86182 Date: Wed, 23 Nov 2022 17:27:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E4=BA=AB=E6=94=B6=E8=97=8F=E8=BF=98?= =?UTF-8?q?=E6=9C=89=E5=9B=9E=E7=AD=94=E7=9A=84=E6=8E=92=E5=BA=8F=EF=BC=8C?= =?UTF-8?q?=E4=BB=8Eid=E6=94=B9=E6=88=90=E5=88=9B=E5=BB=BA=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/FavoritesServiceImpl.java | 14 ++++++------ .../service/impl/SharesServiceImpl.java | 22 +++++++++---------- .../qa/service/impl/QuestionServiceImpl.java | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/impl/FavoritesServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/impl/FavoritesServiceImpl.java index c329af1e..9cced033 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/impl/FavoritesServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/impl/FavoritesServiceImpl.java @@ -129,7 +129,7 @@ public class FavoritesServiceImpl implements IFavoritesService{ builder.addFilter(FieldFilters.eq("sysCreateAid",aid)); builder.setPageIndex(pageIndex); builder.setPageSize(pageSize); - builder.addOrder(OrderCondition.desc("id")); + builder.addOrder(OrderCondition.desc("sysCreateTime")); if(StringUtils.isNotBlank(keyWord)){ builder.addFilter(FieldFilters.like("title", LikeMatchMode.ANYWHERE,keyWord)); } @@ -407,7 +407,7 @@ public class FavoritesServiceImpl implements IFavoritesService{ QueryBuilder query=QueryBuilder.from(Favorites.class); query.setPageIndex(pageIndex); query.setPageSize(pageSize); - query.addOrder(OrderCondition.desc("id")); + query.addOrder(OrderCondition.desc("sysCreateTime")); if(favorite.getObjType()!=null) { query.addFilter(FieldFilters.eq("objType", favorite.getObjType())); } @@ -442,7 +442,7 @@ public class FavoritesServiceImpl implements IFavoritesService{ query.addFields("c.deadTime","c.views","c.comments","c.praises","c.shares","c.favorites","f.objType","c.score"); query.setPageIndex(pageIndex); query.setPageSize(pageSize); - query.addOrder(OrderCondition.desc("f.id")); + query.addOrder(OrderCondition.desc("f.sysCreateTime")); query.addFilter(FieldFilters.eqField("f.objId","c.id")); query.addFilter(FieldFilters.eq("f.objType",BoedxResourceType.Course.value())); //查询用户自己的课程收藏， @@ -511,7 +511,7 @@ public class FavoritesServiceImpl implements IFavoritesService{ QueryBuilder query=QueryBuilder.from(from); query.setPageIndex(pageIndex); query.setPageSize(pageSize); - query.addOrder(OrderCondition.desc("f.id")); + query.addOrder(OrderCondition.desc("f.sysCreateTime")); query.addFilter(FieldFilters.eqField("f.objId","q.id")); query.addFilter(FieldFilters.eq("f.objType",BoedxResourceType.QA.value())); //查询用户自己的问答收藏， @@ -589,7 +589,7 @@ public class FavoritesServiceImpl implements IFavoritesService{ QueryBuilder builder=QueryBuilder.from(from); builder.setPageIndex(pageIndex); builder.setPageSize(pageSize); - builder.addOrder(OrderCondition.desc("f.id")); + builder.addOrder(OrderCondition.desc("f.sysCreateTime")); builder.addFilter(FieldFilters.eqField("f.objId","a.id")); builder.addFilter(FieldFilters.eq("f.objType",BoedxResourceType.Answer.value())); builder.addFilter(FieldFilters.eq("f.sysCreateAid",aid)); @@ -640,7 +640,7 @@ public class FavoritesServiceImpl implements IFavoritesService{ QueryBuilder builder = QueryBuilder.from(from); builder.setPageIndex(pageIndex); builder.setPageSize(pageSize); - builder.addOrder(OrderCondition.desc("f.id")); + builder.addOrder(OrderCondition.desc("f.sysCreateTime")); builder.addFilter(FieldFilters.eqField("f.objId","c.id")); builder.addFilter(FieldFilters.eq("f.objType",BoedxResourceType.Case.value())); builder.addFilter(FieldFilters.eq("f.sysCreateAid",aid)); @@ -685,7 +685,7 @@ public class FavoritesServiceImpl implements IFavoritesService{ QueryBuilder builder = QueryBuilder.from(from); builder.setPageIndex(pageIndex); builder.setPageSize(pageSize); - builder.addOrder(OrderCondition.desc("f.id")); + builder.addOrder(OrderCondition.desc("f.sysCreateTime")); builder.addFilter(FieldFilters.eqField("f.objId","a.id")); builder.addFilter(FieldFilters.eq("f.objType",BoedxResourceType.Article.value())); builder.addFilter(FieldFilters.eq("f.sysCreateAid",aid)); diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/impl/SharesServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/impl/SharesServiceImpl.java index e1e1b3e2..fd083a0f 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/impl/SharesServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/impl/SharesServiceImpl.java @@ -114,7 +114,7 @@ public class SharesServiceImpl implements ISharesService{ QueryBuilder builder = QueryBuilder.from(Shares.class); builder.setPageIndex(pageIndex); builder.setPageSize(pageSize); - builder.addOrder(OrderCondition.desc("id")); + builder.addOrder(OrderCondition.desc("sysCreateTime")); if(shares.getObjType()!=null){ builder.addFilter(FieldFilters.eq("objType",shares.getObjType())); } @@ -163,7 +163,7 @@ public class SharesServiceImpl implements ISharesService{ QueryBuilder builder = QueryBuilder.from(from); builder.setPageIndex(pageIndex); builder.setPageSize(pageSize); - builder.addOrder(OrderCondition.desc("s.id")); + builder.addOrder(OrderCondition.desc("s.sysCreateTime")); builder.addFilter(FieldFilters.eqField("s.objId","q.id")); builder.addFilter(FieldFilters.eq("s.objType",BoedxResourceType.QA.value())); builder.addFilter(FieldFilters.eq("s.sysCreateAid",aid)); @@ -211,7 +211,7 @@ public class SharesServiceImpl implements ISharesService{ QueryBuilder builder = QueryBuilder.from(from); builder.setPageIndex(pageIndex); builder.setPageSize(pageSize); - builder.addOrder(OrderCondition.desc("s.id")); + builder.addOrder(OrderCondition.desc("s.sysCreateTime")); builder.addFilter(FieldFilters.eqField("s.objId","c.id")); builder.addFilter(FieldFilters.eq("s.objType",BoedxResourceType.Case.value())); builder.addFilter(FieldFilters.eq("s.sysCreateAid",aid)); @@ -264,7 +264,7 @@ public class SharesServiceImpl implements ISharesService{ builder.addFields("c.deadTime","c.views","c.comments","c.praises","c.shares","c.favorites,s.isRead"); builder.setPageIndex(pageIndex); builder.setPageSize(pageSize); - builder.addOrder(OrderCondition.desc("s.id")); + builder.addOrder(OrderCondition.desc("s.sysCreateTime")); builder.addFilter(FieldFilters.eqField("s.objId","c.id")); builder.addFilter(FieldFilters.eq("s.objType",BoedxResourceType.Course.value())); builder.addFilter(FieldFilters.eq("s.sysCreateAid",aid)); @@ -324,7 +324,7 @@ public class SharesServiceImpl implements ISharesService{ QueryBuilder builder = QueryBuilder.from(from); builder.setPageIndex(pageIndex); builder.setPageSize(pageSize); - builder.addOrder(OrderCondition.desc("s.id")); + builder.addOrder(OrderCondition.desc("s.sysCreateTime")); builder.addFilter(FieldFilters.eqField("s.objId","a.id")); builder.addFilter(FieldFilters.eq("s.objType",BoedxResourceType.Article.value())); builder.addFilter(FieldFilters.eq("s.sysCreateAid",aid)); @@ -382,7 +382,7 @@ public class SharesServiceImpl implements ISharesService{ QueryBuilder builder = QueryBuilder.from(from); builder.setPageIndex(pageIndex); builder.setPageSize(pageSize); - builder.addOrder(OrderCondition.desc("s.id")); + builder.addOrder(OrderCondition.desc("s.sysCreateTime")); builder.addFilter(FieldFilters.eqField("s.objId","q.id")); builder.addFilter(FieldFilters.eq("s.objType",BoedxResourceType.QA.value())); builder.addFilter(FieldFilters.eq("s.toAid",aid)); @@ -434,7 +434,7 @@ public class SharesServiceImpl implements ISharesService{ QueryBuilder builder = QueryBuilder.from(from); builder.setPageIndex(pageIndex); builder.setPageSize(pageSize); - builder.addOrder(OrderCondition.desc("s.id")); + builder.addOrder(OrderCondition.desc("s.sysCreateTime")); builder.addFilter(FieldFilters.eqField("s.objId","c.id")); builder.addFilter(FieldFilters.eq("s.objType",BoedxResourceType.Case.value())); builder.addFilter(FieldFilters.eq("s.toAid",aid)); @@ -487,7 +487,7 @@ public class SharesServiceImpl implements ISharesService{ builder.addFields("c.deadTime","c.views","c.comments","c.praises","c.shares","c.favorites","s.isRead"); builder.setPageIndex(pageIndex); builder.setPageSize(pageSize); - builder.addOrder(OrderCondition.desc("s.id")); + builder.addOrder(OrderCondition.desc("s.sysCreateTime")); builder.addFilter(FieldFilters.eqField("s.objId","c.id")); builder.addFilter(FieldFilters.eq("s.objType",BoedxResourceType.Course.value())); builder.addFilter(FieldFilters.eq("s.toAid",aid)); @@ -547,7 +547,7 @@ public class SharesServiceImpl implements ISharesService{ QueryBuilder builder = QueryBuilder.from(from); builder.setPageIndex(pageIndex); builder.setPageSize(pageSize); - builder.addOrder(OrderCondition.desc("s.id")); + builder.addOrder(OrderCondition.desc("s.sysCreateTime")); builder.addFilter(FieldFilters.eqField("s.objId","a.id")); builder.addFilter(FieldFilters.eq("s.objType",BoedxResourceType.Article.value())); builder.addFilter(FieldFilters.eq("s.toAid",aid)); @@ -623,7 +623,7 @@ public class SharesServiceImpl implements ISharesService{ builder.addFilter(FieldFilters.eq("sysCreateAid",aid)); builder.setPageIndex(pageIndex); builder.setPageSize(pageSize); - builder.addOrder(OrderCondition.desc("id")); + builder.addOrder(OrderCondition.desc("sysCreateTime")); //关键字查询 if(StringUtils.isNotBlank(keyword)){ builder.addFilter(FieldFilters.or(FieldFilters.like("content",LikeMatchMode.ANYWHERE,keyword), @@ -787,7 +787,7 @@ public class SharesServiceImpl implements ISharesService{ builder.addFilter(FieldFilters.eq("toAid",aid)); builder.setPageIndex(pageIndex); builder.setPageSize(pageSize); - builder.addOrder(OrderCondition.desc("id")); + builder.addOrder(OrderCondition.desc("sysCreateTime")); //关键字查询 if(StringUtils.isNotBlank(keyword)){ builder.addFilter(FieldFilters.or(FieldFilters.like("content",LikeMatchMode.ANYWHERE,keyword), diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/qa/service/impl/QuestionServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/qa/service/impl/QuestionServiceImpl.java index ff1c5d99..d7c61317 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/qa/service/impl/QuestionServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/qa/service/impl/QuestionServiceImpl.java @@ -309,7 +309,7 @@ public class QuestionServiceImpl implements IQuestionService { builder.addFilter(FieldFilters.eq("q.status",1)); builder.addFilter(FieldFilters.eq("a.sysCreateAid",aid)); builder.addFilter(FieldFilters.eqField("a.qid","q.id")); - builder.addOrder(OrderCondition.desc("a.id")); + builder.addOrder(OrderCondition.desc("a.sysCreateTime")); builder.setPageIndex(pageIndex); builder.setPageSize(pageSize); builder.addFields("q.id","q.title","q.content","a.id","a.qid","a.content","q.sysCreateTime","a.sysCreateTime",