|
@@ -218,14 +218,8 @@ public class CustomerApiController {
|
|
|
mp.putAll(JSON.parseObject(json.getString("_source"),Map.class));
|
|
|
|
|
|
if(mp.containsKey("birthday")){
|
|
|
- Date date = jsonOb.getDate("birthday");
|
|
|
- if(date!=null){
|
|
|
- mp.put("birthday", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", date));
|
|
|
- mp.put("age",DateUtils.getAge(date));
|
|
|
- }else{
|
|
|
- mp.put("birthday", "");
|
|
|
- mp.put("age","");
|
|
|
- }
|
|
|
+ mp.put("birthday", jsonOb.getString("birthday").substring(0,10));
|
|
|
+ mp.put("age",DateUtils.getAge(DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS,jsonOb.getString("birthday"))));
|
|
|
}else{
|
|
|
mp.put("birthday", "");
|
|
|
mp.put("age","");
|
|
@@ -363,11 +357,10 @@ public class CustomerApiController {
|
|
|
mpInfo.putAll(JSON.parseObject(jsonObject.getString("_source"),Map.class));
|
|
|
//mpInfo.put("birthday",DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",JSON.parseObject(jsonObject.getString("_source")).getDate("birthday")));
|
|
|
if(mpInfo.containsKey("birthday")){
|
|
|
- Date date = source.getDate("birthday");
|
|
|
- if(date!=null){
|
|
|
- mpInfo.put("birthday",DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",date));
|
|
|
- mpInfo.put("age",DateUtils.getAge(date));
|
|
|
- }
|
|
|
+
|
|
|
+ mpInfo.put("birthday", source.getString("birthday").substring(0,10));
|
|
|
+ mpInfo.put("age",DateUtils.getAge(DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS,source.getString("birthday"))));
|
|
|
+
|
|
|
}else{
|
|
|
mpInfo.put("birthday","");
|
|
|
mpInfo.put("age","");
|
|
@@ -458,11 +451,8 @@ public class CustomerApiController {
|
|
|
mpInfo.putAll(JSON.parseObject(jsonObject.getString("_source"),Map.class));
|
|
|
//mpInfo.put("birthday",DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",JSON.parseObject(jsonObject.getString("_source")).getDate("birthday")));
|
|
|
if(mpInfo.containsKey("birthday")){
|
|
|
- Date date = source.getDate("birthday");
|
|
|
- if(date!=null){
|
|
|
- mpInfo.put("birthday",DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",date));
|
|
|
- mpInfo.put("age",DateUtils.getAge(date));
|
|
|
- }
|
|
|
+ mpInfo.put("birthday", source.getString("birthday").substring(0,10));
|
|
|
+ mpInfo.put("age",DateUtils.getAge(DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS,source.getString("birthday"))));
|
|
|
}else{
|
|
|
mpInfo.put("birthday","");
|
|
|
mpInfo.put("age","");
|