dcs 1 год назад
Родитель
Сommit
a671f0f8ad

+ 27 - 26
virgo.core/src/main/java/com/bosshand/virgo/core/model/MgrClient.java

@@ -4,6 +4,7 @@ package com.bosshand.virgo.core.model;
  * 客户
  */
 public class MgrClient {
+
     /**
      * 客户名称
      */
@@ -54,16 +55,6 @@ public class MgrClient {
      */
     private String customerIndustry;
 
-    /**
-     * 跟进人
-     */
-    private String followUpPerson;
-
-    /**
-     * 首次带看房源
-     */
-    private String firsTimeRoom;
-
     /**
      * 来访渠道
      */
@@ -89,6 +80,16 @@ public class MgrClient {
      */
     private Integer highSeas;
 
+    /**
+     * 跟进人
+     */
+    private String followUpPerson;
+
+    /**
+     * 首次带看房源
+     */
+    private String firsTimeRoom;
+
     private long id;
 
     /**
@@ -181,22 +182,6 @@ public class MgrClient {
         this.customerIndustry = customerIndustry;
     }
 
-    public String getFollowUpPerson() {
-        return followUpPerson;
-    }
-
-    public void setFollowUpPerson(String followUpPerson) {
-        this.followUpPerson = followUpPerson;
-    }
-
-    public String getFirsTimeRoom() {
-        return firsTimeRoom;
-    }
-
-    public void setFirsTimeRoom(String firsTimeRoom) {
-        this.firsTimeRoom = firsTimeRoom;
-    }
-
     public String getVisitingChannels() {
         return visitingChannels;
     }
@@ -237,6 +222,22 @@ public class MgrClient {
         this.highSeas = highSeas;
     }
 
+    public String getFollowUpPerson() {
+        return followUpPerson;
+    }
+
+    public void setFollowUpPerson(String followUpPerson) {
+        this.followUpPerson = followUpPerson;
+    }
+
+    public String getFirsTimeRoom() {
+        return firsTimeRoom;
+    }
+
+    public void setFirsTimeRoom(String firsTimeRoom) {
+        this.firsTimeRoom = firsTimeRoom;
+    }
+
     public long getId() {
         return id;
     }

+ 2 - 2
virgo.manager/src/main/java/com/bosshand/virgo/controller/ClientController.java

@@ -88,8 +88,8 @@ public class ClientController {
                 mc.setUserId(userId);
                 mc.setOrganizationId(organizationId);
             }
-            clientService.batchInsert(list);
-            return Response.ok();
+            //clientService.batchInsert(list);
+            return Response.ok(list);
         } catch (IOException e) {
             return Response.fail(Constant.CODE_BAD_REQUEST, Constant.RET_INPUT_ERROR);
         } finally {

+ 1 - 1
virgo.manager/src/main/java/com/bosshand/virgo/service/ClientService.java

@@ -65,7 +65,7 @@ public class ClientService {
         // 创建行(0基索引)
         Row row = sheet.createRow(0);
         // 创建单元格并写入数据
-        String st = "客户名称,客户类型,联系人,联系电话,微信号,跟进状态,职位,需求区间,装修要求,客户行业,跟进人,首次带看房源,来访渠道,首次来访时间,备注,状态,公海状态";
+        String st = "客户名称,客户类型,联系人,联系电话,微信号,跟进状态,职位,需求区间,装修要求,客户行业,来访渠道,首次来访时间,备注";
         String[] split = st.split(",");
         for (int i = 0; i < split.length; i++) {
             Cell cell = row.createCell(i);