liquanyu / regional-platform

Download as
Browse Code »

Commit 2b052324a777a5e4c608308bdc2a86ee9844a63f

Authored by liquanyu
1 parent 783e0f1788
Exists in master and in 1 other branch dev

儿童营养报告

Showing 4 changed files with 14 additions and 11 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabyNutritionModel.java View file @ 2b05232
... ... @@ -28,7 +28,7 @@
28 28 private Date created;
29 29 private Date modified;
30 30  
31   - private Date NutritiTime;
  31 + private Date nutritiTime;
32 32  
33 33 //主食
34 34 private List<Map> mainFood;
35 35  
... ... @@ -104,11 +104,11 @@
104 104 private String feedType;
105 105  
106 106 public Date getNutritiTime() {
107   - return NutritiTime;
  107 + return nutritiTime;
108 108 }
109 109  
110 110 public void setNutritiTime(Date nutritiTime) {
111   - NutritiTime = nutritiTime;
  111 + this.nutritiTime = nutritiTime;
112 112 }
113 113  
114 114 public String getId() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java View file @ 2b05232
... ... @@ -125,7 +125,10 @@
125 125 babyQuery.setId(id);
126 126 if (CollectionUtils.isNotEmpty(models))
127 127 {
128   - objectResponse.setData(models.get(0));
  128 + BabyNutritionResult result = new BabyNutritionResult();
  129 + result.convertToResult(models.get(0));
  130 +
  131 + objectResponse.setData(result);
129 132 }
130 133 objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
131 134 objectResponse.setErrormsg("成功");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyNutritionRequest.java View file @ 2b05232
... ... @@ -107,7 +107,7 @@
107 107 private String feedType;
108 108  
109 109 //营养填写日期
110   - private String NutritiTime;
  110 + private String nutritiTime;
111 111  
112 112  
113 113 @Override
114 114  
115 115  
... ... @@ -149,16 +149,16 @@
149 149 model.setCook(cook);
150 150 model.setMeal(meal);
151 151 model.setFeedType(feedType);
152   - model.setNutritiTime(DateUtil.parseYMD(NutritiTime));
  152 + model.setNutritiTime(DateUtil.parseYMD(nutritiTime));
153 153 return model;
154 154 }
155 155  
156 156 public String getNutritiTime() {
157   - return NutritiTime;
  157 + return nutritiTime;
158 158 }
159 159  
160 160 public void setNutritiTime(String nutritiTime) {
161   - NutritiTime = nutritiTime;
  161 + this.nutritiTime = nutritiTime;
162 162 }
163 163  
164 164 public String getId() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyNutritionResult.java View file @ 2b05232
... ... @@ -29,7 +29,7 @@
29 29 private String created;
30 30 private String modified;
31 31  
32   - private String NutritiTime;
  32 + private String nutritiTime;
33 33  
34 34 //主食
35 35 private List<Map> mainFood;
36 36  
... ... @@ -149,11 +149,11 @@
149 149 }
150 150  
151 151 public String getNutritiTime() {
152   - return NutritiTime;
  152 + return nutritiTime;
153 153 }
154 154  
155 155 public void setNutritiTime(String nutritiTime) {
156   - NutritiTime = nutritiTime;
  156 + nutritiTime = nutritiTime;
157 157 }
158 158  
159 159 public String getId() {