客户详情接口完善

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

@@ -416,7 +416,7 @@ public class CustomerApiController {
               mp.putAll(JSON.parseObject(json.getString("_source"),Map.class));
               insuranceclaimthread.add(mp);
           }
-            map.put("insuranceclaimthread",insuranceclaimthread);
+          map.put("insuranceclaimthread",insuranceclaimthread);
 
           query  =new HashMap();
           query.put("applicantid",indid);
@@ -435,13 +435,24 @@ public class CustomerApiController {
               mp.putAll(JSON.parseObject(json.getString("_source"),Map.class));
               insurancearrangement.add(mp);
           }
-          map.put("insurancearrangement",insurancearrangement);
-            map.put("custInfo3",null);
-            map.put("custInfo4",null);
-            map.put("custInfo5",null);
-            map.put("custInfo6",null);
-            map.put("custInfo7",null);
-            map.put("custInfo8",null);
+           map.put("insurancearrangement",insurancearrangement);
+           scriptRequest = new Request("GET", "/shanglifeecif.partytimeline/_search?pretty=true&sort=sdate:asc&q=partyid:"+scustid);
+
+           response = restClient.performRequest(scriptRequest);
+           result = EntityUtils.toString(response.getEntity());
+           jsonObject = JSON.parseObject(result);
+           hitsobject = (JSONObject) jsonObject.get("hits");
+           array = JSON.parseArray(hitsobject.get("hits").toString());
+           List partytimeline = new ArrayList<>();
+           for (int i = 0; i <array.size() ; i++) {
+              JSONObject json = (JSONObject)array.get(i);
+              Map mp = new HashMap();
+              mp.put("id",json.getString("_id"));
+              mp.putAll(JSON.parseObject(json.getString("_source"),Map.class));
+              partytimeline.add(mp);
+           }
+           map.put("partytimeline",partytimeline);
+
             return AjaxResult.success(map);
         } catch (Exception e) {
             e.printStackTrace();
@@ -524,7 +535,7 @@ public class CustomerApiController {
             map.put("lineBarChartData",lineBarChartData);
             query  =new HashMap();
             query.put("applicantid",indid);
-            scriptRequest = new Request("GET", "/shanglifeecif.insuranceclaimthread/_search?pretty=true&q=lpid:"+scustid);
+            scriptRequest = new Request("GET", "/shanglifeecif.insuranceclaimthread/_search?pretty=true&q=lpscutid:"+scustid);
 
             response = restClient.performRequest(scriptRequest);
             result = EntityUtils.toString(response.getEntity());