diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BoneQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BoneQuery.java index c111f74..8cb42d4 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BoneQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BoneQuery.java @@ -95,6 +95,14 @@ public class BoneQuery extends BaseQuery implements IConvertToNativeQuery { c = Criteria.where("created").gte(createdTimeStart).lte(createdTimeEnd); } } + + if (null != birthStart && birthEnd != null) { + if (null != c) { + c = c.where("birthday").gte(birthStart).lte(birthEnd); + } else { + c = Criteria.where("birthday").gte(birthStart).lte(birthEnd); + } + } if (null != modifiedStart && modifiedEnd != null) { if (null != c) { c = c.where("modified").gte(modifiedStart).lte(modifiedEnd); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BoneFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BoneFacade.java index 8b59541..f9a82b6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BoneFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BoneFacade.java @@ -177,9 +177,10 @@ public class BoneFacade { { Date currentDate = new Date(); Date start1 = DateUtil.addMonth(currentDate, -start); - Date end2 = DateUtil.addDay(DateUtil.addMonth(currentDate, -end - 1), 1); - query.setBirthStart(start1); - query.setBirthEnd(end2); + query.setBirthEnd(start1); + Date end1 = DateUtil.addDay(DateUtil.addMonth(currentDate, -end - 1), 1); + query.setBirthStart(end1); + System.out.println(query.convertToQuery().convertToMongoQuery().toString()); } List models = BoneService.queryBoneList(query);