jiangjiazhi / regional-platform

Authored by liquanyu over 6 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 22 additions and 22 deletions

...	...	@@ -86,19 +86,19 @@
86	86	private String drink;
87	87
88	88	//烹调油
89		- private Map oil;
	89	+ private String oil;
90	90
91	91	// 烹调油用量 (g/天)
92	92	private String oilGt;
93	93
94	94	//是否经常食用
95		- private Map edible;
	95	+ private String edible;
96	96
97	97	//烹饪方法
98		- private Map cook;
	98	+ private String cook;
99	99
100	100	//用餐时长
101		- private Map meal;
	101	+ private String meal;
102	102
103	103	//喂养方式
104	104	private String feedType;
105	105
...	...	@@ -359,11 +359,11 @@
359	359	this.drink = drink;
360	360	}
361	361
362		- public Map getOil() {
	362	+ public String getOil() {
363	363	return oil;
364	364	}
365	365
366		- public void setOil(Map oil) {
	366	+ public void setOil(String oil) {
367	367	this.oil = oil;
368	368	}
369	369
370	370
371	371
372	372
373	373
374	374
...	...	@@ -375,27 +375,27 @@
375	375	this.oilGt = oilGt;
376	376	}
377	377
378		- public Map getEdible() {
	378	+ public String getEdible() {
379	379	return edible;
380	380	}
381	381
382		- public void setEdible(Map edible) {
	382	+ public void setEdible(String edible) {
383	383	this.edible = edible;
384	384	}
385	385
386		- public Map getCook() {
	386	+ public String getCook() {
387	387	return cook;
388	388	}
389	389
390		- public void setCook(Map cook) {
	390	+ public void setCook(String cook) {
391	391	this.cook = cook;
392	392	}
393	393
394		- public Map getMeal() {
	394	+ public String getMeal() {
395	395	return meal;
396	396	}
397	397
398		- public void setMeal(Map meal) {
	398	+ public void setMeal(String meal) {
399	399	this.meal = meal;
400	400	}
401	401

...	...	@@ -2,6 +2,7 @@
2	2
3	3	import com.lyms.platform.common.base.IBasicRequestConvert;
4	4	import com.lyms.platform.common.utils.DateUtil;
	5	+import com.lyms.platform.common.utils.JsonUtil;
5	6	import com.lyms.platform.pojo.BabyNutritionModel;
6	7
7	8	import java.util.Date;
8	9
...	...	@@ -143,11 +144,11 @@
143	144	model.setEggWz(eggWz);
144	145	model.setEggGc(eggGc);
145	146	model.setDrink(drink);
146		- model.setOil(oil);
	147	+ model.setOil(JsonUtil.obj2JsonString(oil));
147	148	model.setOilGt(oilGt);
148		- model.setEdible(edible);
149		- model.setCook(cook);
150		- model.setMeal(meal);
	149	+ model.setEdible(JsonUtil.obj2JsonString(edible));
	150	+ model.setCook(JsonUtil.obj2JsonString(cook));
	151	+ model.setMeal(JsonUtil.obj2JsonString(meal));
151	152	model.setFeedType(feedType);
152	153	model.setNutritiTime(DateUtil.parseYMD(nutritiTime));
153	154	return model;

1	1	package com.lyms.platform.operate.web.result;
2	2
3	3	import com.lyms.platform.common.utils.DateUtil;
4		-import com.lyms.platform.pojo.AntExChuModel;
	4	+import com.lyms.platform.common.utils.JsonUtil;
5	5	import com.lyms.platform.pojo.BabyNutritionModel;
6	6
7		-import java.util.Date;
8	7	import java.util.List;
9	8	import java.util.Map;
10	9
11	10
...	...	@@ -136,11 +135,11 @@
136	135	setEggWz(model.getEggWz());
137	136	setEggGc(model.getEggGc());
138	137	setDrink(model.getDrink());
139		- setOil(model.getOil());
	138	+ setOil(JsonUtil.getMap(model.getOil()));
140	139	setOilGt(model.getOilGt());
141		- setEdible(model.getEdible());
142		- setCook(model.getCook());
143		- setMeal(model.getMeal());
	140	+ setEdible(JsonUtil.getMap(model.getEdible()));
	141	+ setCook(JsonUtil.getMap(model.getCook()));
	142	+ setMeal(JsonUtil.getMap(model.getMeal()));
144	143	setFeedType(model.getFeedType());
145	144	setCreated(DateUtil.getyyyy_MM_dd(model.getCreated()));
146	145	setModified(DateUtil.getyyyy_MM_dd(model.getModified()));