From 2e4cf829a5175747417305d1021a69ef035b633c Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 31 Jan 2019 14:01:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E8=90=A5=E5=85=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/biz/service/BabyNutritionService.java | 9 +++++++++ .../lyms/platform/operate/web/facade/BabyNutritionFacade.java | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyNutritionService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyNutritionService.java index 19999b5..d3b0d81 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyNutritionService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyNutritionService.java @@ -37,6 +37,15 @@ public class BabyNutritionService { return babyNutritionDao.queryBabyNutritions(query.addOrder(Sort.Direction.DESC, "created")); } + public List queryBabyNutritions(BabyNutritionQuery babyQuery,String sortkey,Sort.Direction sort){ + MongoQuery query = babyQuery.convertToQuery(); + if (StringUtils.isNotEmpty(babyQuery.getNeed())) { + babyQuery.mysqlBuild(babyNutritionDao.queryBabyNutritionCount(babyQuery.convertToQuery())); + query.start(babyQuery.getOffset()).end(babyQuery.getLimit()); + } + return babyNutritionDao.queryBabyNutritions(query.addOrder(sort, sortkey)); + } + public int queryBabyNutritionCount(BabyNutritionQuery babyQuery){ return babyNutritionDao.queryBabyNutritionCount(babyQuery.convertToQuery()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java index 5530eac..c94fa49 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java @@ -83,7 +83,7 @@ public class BabyNutritionFacade { BabyNutritionQuery babyQuery = new BabyNutritionQuery(); babyQuery.setBabyId(babyId); - List models = babyNutritionService.queryBabyNutritions(babyQuery); + List models = babyNutritionService.queryBabyNutritions(babyQuery,"nutritiTime", Sort.Direction.ASC); if (CollectionUtils.isNotEmpty(models)) { for (BabyNutritionModel model : models) -- 1.8.3.1