相似客户导出排序

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

@@ -485,7 +485,7 @@ public class CustomerApiController {
             xaxisData.add("12");
             long insureDay = 0;//投保时长
             int guaranteeDay = 0;//享受保障天数
-            Map majorCategorie = new HashMap();
+            Map<String,Object> majorCategorie = new HashMap();
             Map mpremMap = new HashMap();
             int firstDate = 1;//定义第一次长期险获取
             Date date = new Date();
@@ -643,7 +643,21 @@ public class CustomerApiController {
 
             mpInfo.put("guaranteeDay",guaranteeDay>insureDay?insureDay+"天":guaranteeDay+"天");
             map.put("custInfo",mpInfo);
-            map.put("majorCategorie",majorCategorie);
+            //险种数据准备
+            Map riskMap = new HashMap();
+            riskMap.put("人寿保险","0");
+            riskMap.put("新型寿险","0");
+            riskMap.put("意外伤害保险","0");
+            riskMap.put("医疗险","0");
+            riskMap.put("重疾保险","0");
+            riskMap.put("年金保险","0");
+            for(String key : majorCategorie.keySet()){
+                if(riskMap.containsKey(key)){
+                    riskMap.put(key,majorCategorie.get(key));
+                }
+            }
+
+            map.put("majorCategorie",riskMap);
             logger.info("出客户概览时间："+DateUtils.getTime());
             return AjaxResult.success(map);
         } catch (Exception e) {
@@ -1113,7 +1127,7 @@ public class CustomerApiController {
 
         try{
 
-            Request scriptRequest = new Request("GET", "/shanglifeecif.samecustomer/_search?sort=name:asc&q=sametype:1&size=10000&scroll=5m");
+            Request scriptRequest = new Request("GET", "/shanglifeecif.samecustomer/_search?sort=name:asc,gender:asc,birthday:asc&q=sametype:1&size=10000&scroll=5m");
             Response responseData = restClient.performRequest(scriptRequest);
             String result = EntityUtils.toString(responseData.getEntity());
             JSONObject jsonObject = JSON.parseObject(result);
@@ -1190,7 +1204,7 @@ public class CustomerApiController {
     }
 
     /**
-     * 导出两要素疑似相同指姓名、性别、出生日期一致
+     * 导出两要素疑似相同指姓名、证件号码一致
      * @param response
      * @param request
      */
@@ -1338,6 +1352,13 @@ public class CustomerApiController {
                         customer.setIdCard("\t"+jsonOb.getString("otheridnumber"));
                     }
 
+
+                    customer.setZipCode("\t"+jsonOb.getString("zipcode"));
+                    customer.setMobile("\t"+jsonOb.getString("mobile"));
+                    customer.setEmail("\t"+jsonOb.getString("email"));
+                    customer.setPinDate(jsonOb.getString("pindate"));
+                    customer.setAgentName(jsonOb.getString("agentname"));
+                    customer.setSalecomName(jsonOb.getString("salecomname"));
                     customers.add(customer);
                 }
 
@@ -1357,6 +1378,22 @@ public class CustomerApiController {
             header.put("idCard", "证件号码");
             header.put("sex", "性别");
             header.put("birthDay", "出生日期");
+            if("8".equals(sameType) || "16".equals(sameType)){
+                header.put("mobile", "手机号码");
+            }else if("9".equals(sameType)){
+                header.put("zipCode", "邮政编码");
+            }else if("12".equals(sameType)){
+                header.put("degree", "学历");
+            }else if("14".equals(sameType)){
+                header.put("email", "邮箱");
+            }else if("15".equals(sameType)){
+                header.put("pinDate", "起保日期");
+            }else if("18".equals(sameType)){
+                header.put("agentName", "业务员名称");
+            }else if("19".equals(sameType)){
+                header.put("salecomName", "业绩归属");
+            }
+
             CsvUtil.export(request, response, "customer", header, customers);
 
             logger.info("导出数据清洗出时间："+DateUtils.getTime());

dgtis-modules/dgtis-modules-data/src/main/java/com/dgtis/data/domain/Customer.java

@@ -80,6 +80,30 @@ public class Customer {
     @Excel(name = "保单件数")
     private String num;
 
+    /** 邮编 */
+    @Excel(name = "邮编")
+    private String zipCode;
+
+    /** 手机号 */
+    @Excel(name = "手机号")
+    private String mobile;
+
+    /** 邮箱 */
+    @Excel(name = "邮箱")
+    private String email;
+
+    /** 起保日期 */
+    @Excel(name = "起保日期")
+    private String pinDate;
+
+    /** 业务员名称 */
+    @Excel(name = "业务员名称")
+    private String agentName;
+
+    /** 业绩归属 */
+    @Excel(name = "业绩归属")
+    private String salecomName;
+
     public String getScustId() {
         return scustId;
     }
@@ -207,4 +231,52 @@ public class Customer {
     public void setNum(String num) {
         this.num = num;
     }
+
+    public String getZipCode() {
+        return zipCode;
+    }
+
+    public void setZipCode(String zipCode) {
+        this.zipCode = zipCode;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getPinDate() {
+        return pinDate;
+    }
+
+    public void setPinDate(String pinDate) {
+        this.pinDate = pinDate;
+    }
+
+    public String getAgentName() {
+        return agentName;
+    }
+
+    public void setAgentName(String agentName) {
+        this.agentName = agentName;
+    }
+
+    public String getSalecomName() {
+        return salecomName;
+    }
+
+    public void setSalecomName(String salecomName) {
+        this.salecomName = salecomName;
+    }
 }