Commit 5b1efd51cbc80646bf69c214d3df664e0f512e41
1 parent
442bb31758
Exists in
master
and in
6 other branches
微量元素
Showing 1 changed file with 15 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MicroelementFacade.java
View file @
5b1efd5
| ... | ... | @@ -327,10 +327,21 @@ |
| 327 | 327 | isNormal = true; |
| 328 | 328 | continue; |
| 329 | 329 | } |
| 330 | - MicroelementConfigModel configModel = mongoTemplate.findOne( | |
| 331 | - Query.query(Criteria.where("eleName").is(ele.getEleName()).and("status").is(ele.getStatus()).and("type").is(1) | |
| 332 | - .and("startWeek").gte(month).and("endWeek").lte(month)), MicroelementConfigModel.class); | |
| 333 | - contents.put(configModel.getEleName(),configModel.getContents()); | |
| 330 | + Query query1 = Query.query(Criteria.where("eleName").is(ele.getEleName()).and("status").is(ele.getStatus()).and("type").is(1)); | |
| 331 | + List<MicroelementConfigModel> configModels = mongoTemplate.find(query1 | |
| 332 | + , MicroelementConfigModel.class); | |
| 333 | + if (CollectionUtils.isNotEmpty(configModels)) | |
| 334 | + { | |
| 335 | + for (MicroelementConfigModel configModel : configModels) | |
| 336 | + { | |
| 337 | + if (configModel.getStartWeek() >= month && month <= configModel.getEndWeek()) | |
| 338 | + { | |
| 339 | + contents.put(configModel.getEleName(),configModel.getContents()); | |
| 340 | + break; | |
| 341 | + } | |
| 342 | + } | |
| 343 | + } | |
| 344 | + | |
| 334 | 345 | } |
| 335 | 346 | } |
| 336 | 347 |