From 8d742ac95374b4af5d177813e81b178033ec4dfe Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Tue, 29 Jan 2019 15:09:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E8=90=A5=E5=85=BB=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/pojo/BabyNutritionModel.java | 24 +++++++++++-----------
 .../operate/web/request/BabyNutritionRequest.java  |  9 ++++----
 .../operate/web/result/BabyNutritionResult.java    | 11 +++++-----
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyNutritionModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyNutritionModel.java
index 1879cb2..db17796 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyNutritionModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyNutritionModel.java
@@ -86,19 +86,19 @@ public class BabyNutritionModel {
     private String drink;
 
     //烹调油
-    private Map oil;
+    private String oil;
 
     //	烹调油用量  (g/天)
     private String oilGt;
 
     //是否经常食用
-    private Map edible;
+    private String edible;
 
     //烹饪方法
-    private Map cook;
+    private String cook;
 
     //用餐时长
-    private Map meal;
+    private String meal;
 
     //喂养方式
     private String feedType;
@@ -359,11 +359,11 @@ public class BabyNutritionModel {
         this.drink = drink;
     }
 
-    public Map getOil() {
+    public String getOil() {
         return oil;
     }
 
-    public void setOil(Map oil) {
+    public void setOil(String oil) {
         this.oil = oil;
     }
 
@@ -375,27 +375,27 @@ public class BabyNutritionModel {
         this.oilGt = oilGt;
     }
 
-    public Map getEdible() {
+    public String getEdible() {
         return edible;
     }
 
-    public void setEdible(Map edible) {
+    public void setEdible(String edible) {
         this.edible = edible;
     }
 
-    public Map getCook() {
+    public String getCook() {
         return cook;
     }
 
-    public void setCook(Map cook) {
+    public void setCook(String cook) {
         this.cook = cook;
     }
 
-    public Map getMeal() {
+    public String getMeal() {
         return meal;
     }
 
-    public void setMeal(Map meal) {
+    public void setMeal(String meal) {
         this.meal = meal;
     }
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyNutritionRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyNutritionRequest.java
index fd71c70..5011c0b 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyNutritionRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyNutritionRequest.java
@@ -2,6 +2,7 @@ package com.lyms.platform.operate.web.request;
 
 import com.lyms.platform.common.base.IBasicRequestConvert;
 import com.lyms.platform.common.utils.DateUtil;
+import com.lyms.platform.common.utils.JsonUtil;
 import com.lyms.platform.pojo.BabyNutritionModel;
 
 import java.util.Date;
@@ -143,11 +144,11 @@ public class BabyNutritionRequest implements IBasicRequestConvert<BabyNutritionM
         model.setEggWz(eggWz);
         model.setEggGc(eggGc);
         model.setDrink(drink);
-        model.setOil(oil);
+        model.setOil(JsonUtil.obj2JsonString(oil));
         model.setOilGt(oilGt);
-        model.setEdible(edible);
-        model.setCook(cook);
-        model.setMeal(meal);
+        model.setEdible(JsonUtil.obj2JsonString(edible));
+        model.setCook(JsonUtil.obj2JsonString(cook));
+        model.setMeal(JsonUtil.obj2JsonString(meal));
         model.setFeedType(feedType);
         model.setNutritiTime(DateUtil.parseYMD(nutritiTime));
         return model;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyNutritionResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyNutritionResult.java
index d9bb134..b9104a3 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyNutritionResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyNutritionResult.java
@@ -1,10 +1,9 @@
 package com.lyms.platform.operate.web.result;
 
 import com.lyms.platform.common.utils.DateUtil;
-import com.lyms.platform.pojo.AntExChuModel;
+import com.lyms.platform.common.utils.JsonUtil;
 import com.lyms.platform.pojo.BabyNutritionModel;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -136,11 +135,11 @@ public class BabyNutritionResult {
         setEggWz(model.getEggWz());
         setEggGc(model.getEggGc());
         setDrink(model.getDrink());
-        setOil(model.getOil());
+        setOil(JsonUtil.getMap(model.getOil()));
         setOilGt(model.getOilGt());
-        setEdible(model.getEdible());
-        setCook(model.getCook());
-        setMeal(model.getMeal());
+        setEdible(JsonUtil.getMap(model.getEdible()));
+        setCook(JsonUtil.getMap(model.getCook()));
+        setMeal(JsonUtil.getMap(model.getMeal()));
         setFeedType(model.getFeedType());
         setCreated(DateUtil.getyyyy_MM_dd(model.getCreated()));
         setModified(DateUtil.getyyyy_MM_dd(model.getModified()));
-- 
1.8.3.1