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

src/main/java/com/huiju/estateagents/controller/TaRecommendCustomerController.java

@@ -791,15 +791,15 @@ public class TaRecommendCustomerController extends BaseController {
             // 设置 sheet, 同一个sheet只需要设置一次
             WriteSheet writeSheet = EasyExcel.writerSheet("客户列表-公客").build();
 
-            Integer count = taRecommendCustomerMapper.getPublicCustomerExportListCount(name, tel,  entryType, verifyStatus, sex, orgId,consultTel);
-            pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
-            List<PublicCustomerExport> publicList = null;
-            do {
-                publicList = taRecommendCustomerMapper.getPublicCustomerExportList(pageCode * pageSize, pageSize, name, tel,  entryType, verifyStatus, sex, orgId,consultTel);
+//            Integer count = taRecommendCustomerMapper.getPublicCustomerExportListCount(name, tel,  entryType, verifyStatus, sex, orgId,consultTel);
+//            pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
+//            List<PublicCustomerExport> publicList = null;
+//            do {
+                List<PublicCustomerExport> publicList = taRecommendCustomerMapper.getPublicCustomerExportList(pageCode * pageSize, pageSize, name, tel,  entryType, verifyStatus, sex, orgId,consultTel);
                 excelWriter.write(publicList, writeSheet);
 
-                pageCode ++;
-            } while (pageCode <= pageCount);
+//                pageCode ++;
+//            } while (pageCode <= pageCount);
 
             // finish 会帮忙关闭流
             excelWriter.finish();
@@ -813,15 +813,15 @@ public class TaRecommendCustomerController extends BaseController {
             // 设置 sheet, 同一个sheet只需要设置一次
             WriteSheet writeSheet = EasyExcel.writerSheet("客户列表-私客").build();
 
-            Integer count = taRecommendCustomerMapper.getCustomerExportListCount(buildingId, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId,status,getTaPersonBuildingListByUserId(request));
-            pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
-            List<PrivateCustomerExport> privateList = null;
-            do {
-                privateList = taRecommendCustomerMapper.getCustomerExportList(pageCode *  pageSize, pageSize, buildingId, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId,status,getTaPersonBuildingListByUserId(request));
+//            Integer count = taRecommendCustomerMapper.getCustomerExportListCount(buildingId, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId,status,getTaPersonBuildingListByUserId(request));
+//            pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
+//            List<PrivateCustomerExport> privateList = null;
+//            do {
+                List<PrivateCustomerExport> privateList = taRecommendCustomerMapper.getCustomerExportList(pageCode *  pageSize, pageSize, buildingId, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId,status,getTaPersonBuildingListByUserId(request));
                 excelWriter.write(privateList, writeSheet);
 
-                pageCode ++;
-            } while (pageCode <= pageCount);
+//                pageCode ++;
+//            } while (pageCode <= pageCount);
             // finish 会帮忙关闭流
             excelWriter.finish();
 

src/main/resources/mapper/TaActivityDynamicEnlistMapper.xml

@@ -29,7 +29,7 @@
                         and tade.phone like CONCAT('%',#{phone}, '%')
                     </if>
                 </where>
-
+            group by tade.person_id
 
         </select>
 
@@ -63,6 +63,7 @@
                 and tade.phone like CONCAT('%',#{phone}, '%')
             </if>
         </where>
+        group by tade.person_id
         limit #{pageCode}, #{pageSize}
     </select>
 </mapper>

src/main/resources/mapper/TaPersonMapper.xml

@@ -257,7 +257,7 @@ FROM
             FROM
                ta_person tp
              LEFT JOIN
-            ( SELECT *, MAX(visit_time) as max_visit_time FROM ta_person_visit_record GROUP BY  person_id  ) as tpvr
+                ( SELECT *, MAX(visit_time) as max_visit_time FROM ta_person_visit_record where org_id = #{org} GROUP BY  person_id  ) as tpvr
             ON tp.person_id = tpvr.person_id
              where tp.org_id = #{org} AND tp.person_type IN ('customer','drift','estate agent')
              GROUP BY DATE_FORMAT( tpvr.max_visit_time , '%Y-%m-%d' )

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -111,12 +111,13 @@ FROM
         SELECT
         a.*,
         a.customer_id AS customerId,
-        b.NAME AS consultantName,
-        b.tel AS consultTel,
+        if(b.NAME  = null, d.name, b.name) as consultantName,
+        if(b.tel  = null, d.tel, b.tel) AS consultTel,
         c.building_name as intentionName
         FROM
         ta_recommend_customer a
-        LEFT JOIN ta_person b ON (a.realty_consultant = b.person_id or a.realty_consultant = b.user_id)
+        LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
+        LEFT JOIN ta_person d on a.realty_consultant = d.user_id
         LEFT JOIN ta_building c ON a.building_id = c.building_id
         <where>
             a.status > 0
@@ -266,7 +267,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.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)
         </where>
         order by b.create_date desc
     </select>
@@ -514,7 +515,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.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)
         </where>
         order by b.create_date desc
     </select>
@@ -547,12 +548,12 @@ 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.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
-        limit #{pageCode}, #{pageSize}
     </select>
+    <!--        limit #{pageCode}, #{pageSize}-->
 
     <select id="getCustomerExportListCount" resultType="Integer" >
         SELECT
@@ -671,8 +672,8 @@ FROM
         </where>
         group by a.customer_id,a.building_id
         order by a.create_date desc
-        limit #{pageCode}, #{pageSize}
     </select>
+    <!--        limit #{pageCode}, #{pageSize}-->
 
     <select id="getMyCustStatistics" resultType="java.util.Map">
         SELECT

src/main/resources/mapper/TaShareCountMapper.xml

@@ -81,7 +81,8 @@
                 left join ta_building e on t.target_id = e.building_id and t.target_type = 'building_share'
                 LEFT JOIN ta_news f on t.target_id = f.news_id and t.target_type = 'news_share'
 
-        LEFT JOIN ta_person a ON t.share_person = a.person_id or t.share_person = a.user_id
+        LEFT JOIN ta_person a ON t.share_person = a.person_id
+        LEFT JOIN ta_person y on t.share_person = y.user_id
         LEFT JOIN ta_person z ON t.person_id = z.person_id
         WHERE
             (t.share_person = (select user_id from ta_person where person_id = #{personId}) or t.share_person = #{personId})

src/main/resources/mapper/TaSharePersonFromMapper.xml

@@ -3,13 +3,14 @@
 <mapper namespace="com.huiju.estateagents.mapper.TaSharePersonFromMapper">
 
     <select id="countViewNum" resultType="java.lang.Integer">
-      select count(*) from (
+        select count(*) from (
         select count(1) from ta_share_person_from t
-        left join ta_person a on t.share_person = a.person_id or t.share_person = a.user_id
+        left join ta_person a on t.share_person = a.person_id
+        left join ta_person b on t.share_person = b.user_id
         where
-        (t.share_person = #{userId}
+        t.share_person in (#{userId}
         <if test="personId != null and personId != ''">
-            or t.share_person = #{personId}
+            ,#{personId}
         </if>
         )
         and t.org_id = #{orgId} and t.status = 1 and t.person_id != #{personId}
@@ -20,6 +21,6 @@
             and  date_format(t.create_date,'%Y-%m-%d') &lt;= date_format(#{endCreateDate},'%Y-%m-%d')
         </if>
         GROUP BY t.person_id
-      ) t
+        ) t
     </select>
 </mapper>