From f697a5284fdd1997a0ef053c53d15a283ef8616b Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 13 Mar 2020 08:47:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E9=87=8F=E5=85=83=E7=B4=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/operate/web/facade/MicroelementFacade.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MicroelementFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MicroelementFacade.java index 1bbcb1f..059a35b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MicroelementFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MicroelementFacade.java @@ -317,6 +317,7 @@ public class MicroelementFacade { data.put("created", DateUtil.getyyyy_MM_dd(model.getCreated())); Map> contents = new HashMap<>(); boolean isNormal = false; + int month = DateUtil.getBabyAgeMonth(babyModel.getBirth(),model.getCreated()); if (CollectionUtils.isNotEmpty(model.getMicroelements())) { for (MicroelementModel.Microelement ele : model.getMicroelements()) @@ -327,7 +328,8 @@ public class MicroelementFacade { continue; } MicroelementConfigModel configModel = mongoTemplate.findOne( - Query.query(Criteria.where("eleName").is(ele.getEleName()).and("status").is(ele.getStatus()).and("type").is(1)), MicroelementConfigModel.class); + Query.query(Criteria.where("eleName").is(ele.getEleName()).and("status").is(ele.getStatus()).and("type").is(1) + .and("startWeek").gte(month).and("endWeek").lte(month)), MicroelementConfigModel.class); contents.put(configModel.getEleName(),configModel.getContents()); } } -- 1.8.3.1