jiangjiazhi / regional-platform | GitLab

Commit 5d34e1c6d20e2666370a8d7118577f92d442e258

Authored by liquanyu over 8 years ago

1 parent b01744422b

Exists in master and in 6 other branches

update code

Showing 3 changed files with 3 additions and 3 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java

...	...	@@ -501,7 +501,7 @@
501	501	setId(destModel.getId());
502	502	setPid(destModel.getPid());
503	503	setBabyName(destModel.getName());
504		- setSex(SexEnum.getTextById(destModel.getSex()));
	504	+ setSex(destModel.getSex() == null ? "" : SexEnum.getTextById(destModel.getSex()));
505	505	setBabyBirthday(DateUtil.getyyyy_MM_dd(destModel.getBirth()));
506	506	setMonthAge(DateUtil.getBabyMonthAge(destModel.getBirth(), new Date()));
507	507

...	...	@@ -99,7 +99,7 @@
99	99	query.setNeed("0");
100	100	List<SyncDataModel> list = syncDataService.querySyncData(query);
101	101	for (SyncDataModel model : list) {
102		- if (MongoSyncUtil.syncSll(model.getAction(), model.getJsonData(), model.getDataId(), model.getClassName())) {
	102	+ if (MongoSyncUtil.sync(model.getAction(), model.getJsonData(), model.getDataId(), model.getClassName())) {
103	103	model.setStatus(0);
104	104	model.setModified(new Date());
105	105	syncDataService.updateSyncData(model);

...	...	@@ -57,7 +57,7 @@
57	57	} else {
58	58	result.setHighRisk("高危");
59	59	}
60		- result.setSex(StringUtils.emptyDeal(SexEnum.getTextById(model.getSex())));
	60	+ result.setSex(model.getSex() == null ? "" : StringUtils.emptyDeal(SexEnum.getTextById(model.getSex())));
61	61	result.setBabyName(StringUtils.emptyDeal(model.getName()));
62	62	result.setBirthday(StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(model.getBirth())));
63	63	result.setMommyName(StringUtils.emptyDeal(model.getMname()));