jiangjiazhi / regional-platform

Authored by dongqin over 6 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 8 additions and 5 deletions

...	...	@@ -1489,10 +1489,10 @@
1489	1489	public static Date getDayFirstSecond(Date date) {
1490	1490	Calendar instance = Calendar.getInstance();
1491	1491	instance.setTime(date);
1492		- instance.add(Calendar.HOUR_OF_DAY, 0);
1493		- instance.add(Calendar.MINUTE, 0);
1494		- instance.add(Calendar.SECOND, 0);
1495		- instance.add(Calendar.MILLISECOND, 0);
	1492	+ instance.set(Calendar.HOUR_OF_DAY, 0);
	1493	+ instance.set(Calendar.MINUTE, 0);
	1494	+ instance.set(Calendar.SECOND, 0);
	1495	+ instance.set(Calendar.MILLISECOND, 0);
1496	1496	return instance.getTime();
1497	1497	}
1498	1498

...	...	@@ -345,9 +345,11 @@
345	345	// 更新
346	346	update(userId, configId, id);
347	347	} else {
	348	+ Date dayFirstSecond = DateUtil.getDayFirstSecond(new Date());
	349	+ Date dayLastSecond = DateUtil.getDayLastSecond(new Date());
348	350
349	351	BabyNeuroPsychologicalModel model = mongoTemplate.findOne(Query.query(Criteria.where("babyId").is(babyId).and("createTime")
350		- .gte(DateUtil.getDayFirstSecond(new Date())).lte(DateUtil.getDayLastSecond(new Date())).and("yn").is(YnEnums.YES.getId())), BabyNeuroPsychologicalModel.class);
	352	+ .gte(dayFirstSecond).lte(dayLastSecond).and("yn").is(YnEnums.YES.getId())), BabyNeuroPsychologicalModel.class);
351	353	if (model != null) {
352	354	// 更新
353	355	update(userId, configId, model.getId());
...	...	@@ -484,6 +486,7 @@
484	486	stringMap.put("checkMonth", DateUtil.getBabyMonthAge(model.getBirth(), model.getCheckTime()));
485	487	stringMap.put("mcertNo", "1".equals(param.getIsEncrypt()) ? EncryptUtil.numberEncrypt(model.getMcertNo()) : model.getMcertNo());
486	488	stringMap.put("mphone", "1".equals(param.getIsEncrypt()) ? EncryptUtil.numberEncrypt(model.getMphone()) : model.getMphone());
	489	+ stringMap.put("birthStr", DateUtil.getyyyy_MM_dd(model.getBirth()));
487	490	add(stringMap);
488	491	}
489	492	}};