diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ArchiveDataServicer.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ArchiveDataServicer.java index 7af094f..6f0efa4 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ArchiveDataServicer.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ArchiveDataServicer.java @@ -6,6 +6,7 @@ import com.lyms.platform.pojo.ArchiveData; import com.lyms.platform.query.ArchiveDataQuery; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; import java.util.List; @@ -28,13 +29,13 @@ public class ArchiveDataServicer { } - public List query(ArchiveDataQuery archiveDataQuery) { + public List query(ArchiveDataQuery archiveDataQuery,Sort.Direction direction,String field) { MongoQuery query = archiveDataQuery.convertToQuery(); if (StringUtils.isNotEmpty(archiveDataQuery.getNeed())) { archiveDataQuery.mysqlBuild(archiveDataDao.ArchiveDataCount(archiveDataQuery.convertToQuery())); query.start(archiveDataQuery.getOffset()).end(archiveDataQuery.getLimit()); } - return archiveDataDao.query(query); + return archiveDataDao.query(query.addOrder(direction, field)); } diff --git a/platform-biz-service/src/main/resources/mainOrm/master/AssistBuildMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/AssistBuildMapper.xml index 6dce6fc..3faf4a4 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/AssistBuildMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/AssistBuildMapper.xml @@ -23,9 +23,6 @@ and phone = #{phone,jdbcType=VARCHAR} - - order by ${sort} - diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AssistBuildFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AssistBuildFacade.java index 0642a1a..9539678 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AssistBuildFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AssistBuildFacade.java @@ -15,6 +15,7 @@ import com.lyms.platform.pojo.AssistBuildUserModel; import com.lyms.platform.query.ArchiveDataQuery; import net.sf.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Sort; import org.springframework.stereotype.Component; import java.text.ParseException; @@ -170,7 +171,6 @@ public class AssistBuildFacade { List result = new ArrayList(); ArchiveDataQuery query = new ArchiveDataQuery(); - query.setSort(" created desc "); List userModels = assistBuildService.queryAssistBuildUsers(param); if (CollectionUtils.isNotEmpty(userModels)) { AssistBuildUserModel model = userModels.get(0); @@ -185,7 +185,7 @@ public class AssistBuildFacade { query.setNeed("true"); query.setLimit(limit); - List list = archiveDataServicer.query(query); + List list = archiveDataServicer.query(query, Sort.Direction.DESC,"created"); if (CollectionUtils.isNotEmpty(list)) { for (ArchiveData archiveData : list) @@ -209,7 +209,6 @@ public class AssistBuildFacade { List result = new ArrayList(); ArchiveDataQuery query = new ArchiveDataQuery(); - query.setSort(" created desc "); List userModels = assistBuildService.queryAssistBuildUsers(param); if (CollectionUtils.isNotEmpty(userModels)) { AssistBuildUserModel model = userModels.get(0); @@ -219,7 +218,7 @@ public class AssistBuildFacade { query.setBuildDateStart(start); query.setBuildDateEnd(DateUtil.addMonth(start, 1)); - List list = archiveDataServicer.query(query); + List list = archiveDataServicer.query(query, Sort.Direction.DESC,"buildDate"); if (CollectionUtils.isNotEmpty(list)) { for (ArchiveData archiveData : list) @@ -240,7 +239,7 @@ public class AssistBuildFacade { public BaseResponse getArchiveUserInfo(String archiveId) { ArchiveDataQuery query = new ArchiveDataQuery(); query.setId(archiveId); - List list = archiveDataServicer.query(query); + List list = archiveDataServicer.query(query,Sort.Direction.DESC,"created"); String json = ""; if (CollectionUtils.isNotEmpty(list)) {