个体关系页面取值完善

dgtis-modules/dgtis-modules-data/src/main/java/com/dgtis/data/api/CustomerApiController.java

@@ -315,8 +315,8 @@ public class CustomerApiController {
                 mp.putAll(JSON.parseObject(json.getString("_source"),Map.class));
 
                 if(mp.containsKey("birthday")){
-                    mp.put("birthday", jsonOb.getString("birthday").length()>10?jsonOb.getString("birthday").substring(0,10):jsonOb.getString("birthday"));
-                    mp.put("age",DateUtils.getAge(DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS,jsonOb.getString("birthday"))));
+                    mp.put("birthday", jsonOb.getString("birthday"));
+                    mp.put("age",DateUtils.getAge(DateUtils.dateTime(DateUtils.YYYY_MM_DD,jsonOb.getString("birthday"))));
                 }else{
                     mp.put("birthday", "");
                     mp.put("age","");
@@ -469,8 +469,8 @@ public class CustomerApiController {
           String scustid = source.getString("scustid");
           mpInfo.putAll(JSON.parseObject(jsonObject.getString("_source"),Map.class));
             if(mpInfo.containsKey("birthday")){
-                mpInfo.put("birthday", source.getString("birthday").length()>10?source.getString("birthday").substring(0,10):source.getString("birthday"));
-                mpInfo.put("age",DateUtils.getAge(DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS,source.getString("birthday"))));
+                mpInfo.put("birthday", source.getString("birthday"));
+                mpInfo.put("age",DateUtils.getAge(DateUtils.dateTime(DateUtils.YYYY_MM_DD,source.getString("birthday"))));
 
             }else{
                 mpInfo.put("birthday","");
@@ -479,7 +479,7 @@ public class CustomerApiController {
             map.put("custInfo",mpInfo);
           Map query  =new HashMap();
           query.put("indid1",indid);
-           scriptRequest = new Request("GET", "/shanglifeecif.indrelationship/_search?pretty=true&q=indid1:"+indid);
+           scriptRequest = new Request("GET", "/shanglifeecif.indrelationship/_search?pretty=true&q=indid1:"+scustid);
           response = restClient.performRequest(scriptRequest);
           result = EntityUtils.toString(response.getEntity());
           jsonObject = JSON.parseObject(result);
@@ -574,8 +574,8 @@ public class CustomerApiController {
             String scustid = source.getString("scustid");
             mpInfo.putAll(JSON.parseObject(jsonObject.getString("_source"),Map.class));
             if(mpInfo.containsKey("birthday")){
-                mpInfo.put("birthday", source.getString("birthday").length()>10?source.getString("birthday").substring(0,10):source.getString("birthday"));
-                mpInfo.put("age",DateUtils.getAge(DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS,source.getString("birthday"))));
+                mpInfo.put("birthday", source.getString("birthday"));
+                mpInfo.put("age",DateUtils.getAge(DateUtils.dateTime(DateUtils.YYYY_MM_DD,source.getString("birthday"))));
             }else{
                 mpInfo.put("birthday","");
                 mpInfo.put("age","");
@@ -1177,10 +1177,10 @@ public class CustomerApiController {
                     customer.setName(jsonOb.getString("name"));
                     customer.setSex("0".equals(jsonOb.getString("gender"))?"男":"女");
                     if(mp.containsKey("birthday")){
-                        String birthday = jsonOb.getString("birthday").length()>10?jsonOb.getString("birthday").substring(0,10):jsonOb.getString("birthday");
+                        String birthday = jsonOb.getString("birthday");
                         mp.put("birthday", birthday);
                         customer.setBirthDay("\t"+birthday);
-                        customer.setAge(DateUtils.getAge(DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS,jsonOb.getString("birthday"))));
+                        customer.setAge(DateUtils.getAge(DateUtils.dateTime(DateUtils.YYYY_MM_DD,jsonOb.getString("birthday"))));
                     }
 
                     if(mp.containsKey("idcard")){
@@ -1265,10 +1265,10 @@ public class CustomerApiController {
                     customer.setName(jsonOb.getString("name"));
                     customer.setSex("0".equals(jsonOb.getString("gender"))?"男":"女");
                     if(mp.containsKey("birthday")){
-                        String birthday = jsonOb.getString("birthday").length()>10?jsonOb.getString("birthday").substring(0,10):jsonOb.getString("birthday");
+                        String birthday = jsonOb.getString("birthday");
                         mp.put("birthday", birthday);
                         customer.setBirthDay(birthday);
-                        customer.setAge(DateUtils.getAge(DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS,jsonOb.getString("birthday"))));
+                        customer.setAge(DateUtils.getAge(DateUtils.dateTime(DateUtils.YYYY_MM_DD,jsonOb.getString("birthday"))));
                     }
 
                     if(mp.containsKey("idcard")){
@@ -1353,10 +1353,10 @@ public class CustomerApiController {
                     customer.setName(jsonOb.getString("name"));
                     customer.setSex("0".equals(jsonOb.getString("gender"))?"男":"女");
                     if(mp.containsKey("birthday")){
-                        String birthday = jsonOb.getString("birthday").length()>10?jsonOb.getString("birthday").substring(0,10):jsonOb.getString("birthday");
+                        String birthday = jsonOb.getString("birthday");
                         mp.put("birthday", birthday);
                         customer.setBirthDay("\t"+birthday);
-                        customer.setAge(DateUtils.getAge(DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS,jsonOb.getString("birthday"))));
+                        customer.setAge(DateUtils.getAge(DateUtils.dateTime(DateUtils.YYYY_MM_DD,jsonOb.getString("birthday"))));
                     }
 
                     if(mp.containsKey("idcard")){