Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

src/main/java/com/huiju/estateagents/excel/PrivateCustomerExport.java

@@ -86,4 +86,18 @@ public class PrivateCustomerExport {
     @ColumnWidth(15)
     @ExcelProperty(value = "意向度（意向值）", index = 8)
     private String intention ;
+
+    /**
+     * 意向度
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "推广人员", index = 10)
+    private String sharePersonName ;
+
+    /**
+     * 意向度
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "积分值", index = 11)
+    private String points ;
 }

src/main/java/com/huiju/estateagents/excel/PublicCustomerExport.java

@@ -72,4 +72,18 @@ public class PublicCustomerExport {
     @ColumnWidth(15)
     @ExcelProperty(value = "项目名称", index = 3)
     private String buildingName;
+
+    /**
+     * 意向度
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "推广人员", index = 8)
+    private String sharePersonName ;
+
+    /**
+     * 意向度
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "积分值", index = 9)
+    private String points ;
 }

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -551,11 +551,15 @@ FROM
           concat(b.country, b.province) as province,
           z.intention,
           d.scene_alias as sceneType,
-          t.building_name
+          t.building_name,
+          ifnull( c.nickname, c.NAME ) AS sharePersonName ,
+          s.points
         FROM
         ta_person b
         LEFT JOIN ta_person_from_record r ON b.person_id = r.person_id AND r.is_first_time = 1 and r.org_id = #{orgId}
         left join ta_building t on b.building_id = t.building_id
+        LEFT JOIN ta_person c ON b.recommend_person = c.person_id AND c.org_id = #{orgId}
+        left JOIN (select sum(points_amount) as points,person_id from ta_points_records where org_id = #{orgId} GROUP BY person_id) s on b.person_id = s.person_id
         left join (select sum(t.intention) as intention,t.person_id From ta_person_intention_record t where t.org_id = #{orgId} group by t.person_id) z on z.person_id = b.person_id
         left join td_wx_dict d on r.scene_id = d.scene_id
         <where>
@@ -591,7 +595,7 @@ FROM
             <if test="consultTel != null and consultTel !=''">
                 and b.tel like CONCAT('%',#{consultTel}, '%')
             </if>
-            and NOT EXISTS ( select * from ta_recommend_customer a where a.org_id = #{orgId} and a.recommend_person = b.person_id)
+<!--            and NOT EXISTS ( select * from ta_recommend_customer a where a.org_id = #{orgId} and a.recommend_person = b.person_id)-->
             AND b.person_id not IN ( SELECT c.person_id FROM ta_recommend_customer c WHERE c.org_id = #{orgId} AND person_id is not null AND person_id != ''  )
         </where>
         order by b.create_date desc
@@ -667,15 +671,18 @@ FROM
         z.intention,
         a.create_date,
         concat(a.country,a.province) as province,
-        w.scene_alias as scene_type
+        w.scene_alias as scene_type,
+        IFNULL( c.NAME, c.nickname ) AS sharePersonName,
+        s.points
         FROM
         ta_recommend_customer a
         LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
-        LEFT JOIN ta_person c ON a.realty_consultant = c.user_id
         LEFT JOIN ta_user d on d.user_id = a.realty_consultant
         LEFT JOIN ta_person_from_record p ON a.person_id = p.person_id AND p.is_first_time = 1 and p.org_id = #{orgId}
+        LEFT JOIN ta_person c ON p.share_person_id = c.person_id
         left join ta_building t on a.building_id = t.building_id
         LEFT JOIN td_wx_dict w ON p.scene_id = w.scene_id
+        left JOIN (select sum(points_amount) as points,person_id from ta_points_records where org_id = #{orgId} GROUP BY person_id) s on a.person_id = s.person_id
         left join (select sum(t.intention) as intention,t.person_id From ta_person_intention_record t where t.org_id = #{orgId} group by t.person_id) z on z.person_id = a.person_id
         <where>
             a.status > 0