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

src/main/java/com/huiju/estateagents/drainage/controller/TaDrainageController.java

             queryWrapper.eq("org_id",taDrainage.getOrgId());
             queryWrapper.eq("content_type",CommConstant.EVENT_H5);
             queryWrapper.eq("target_id",taDrainage.getDrainageId());
+
+            queryWrapper.gt("status", CommConstant.STATUS_DELETE); // fix bug #6816
+
             List<ExtendContent> list = iExtendContentService.list(queryWrapper);
             if (null != taDrainage.getStatus() && taDrainage.getStatus().equals(CommConstant.STATUS_NORMAL)){
                 taDrainage.setStatus(CommConstant.STATUS_UNACCALIMED);

src/main/java/com/huiju/estateagents/service/impl/TaUvServiceImpl.java

             return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
 
+        if (typeOf.equals(CommConstant.FAVOR_PROJECT)) {
+            buildingMapper.setFieldNum(id,"pv_num",1);
+        }
+
         TaPerson taPerson = persons.get(0);
 
         QueryWrapper<TaUv> queryWrapper = new QueryWrapper<>();
         if (typeOf.equals(CommConstant.FAVOR_CONSULTANT)) {
             taPersonMapper.setFieldIncrement(id,"hot_num", 1);
         }
-        if (typeOf.equals(CommConstant.FAVOR_PROJECT)) {
-            buildingMapper.setFieldNum(id,"pv_num",1);
-        }
 
         return ResponseBean.success("");
     }

src/main/java/com/huiju/estateagents/service/impl/TsActivityDailyServiceImpl.java

     @Override
     public List<TsActivityDaily> getActivityDetail(Integer orgId, String startDate, String endDate, String buildingId, String targetType, String targetId, String targetName, String asc, String desc) {
         if (StringUtils.isEmpty(asc) && StringUtils.isEmpty(desc)) {
-            desc = "statis_date";
+            asc = "statis_date";
         }
 
         return tsActivityDailyMapper.getActivityDetail(orgId, startDate, endDate, buildingId, targetType, targetId, targetName, asc, desc);

src/main/resources/mapper/TaBuildingMapper.xml

             FROM
             sequence a
             WHERE
-            a.rownum <= datediff( #{endDate}, #{startDate} )
+            a.rownum < datediff( #{endDate}, #{startDate} )
         ) t
         LEFT JOIN (
             SELECT
         FROM
         sequence a
         WHERE
-        a.rownum <= datediff( #{endDate}, #{startDate} )
+        a.rownum < datediff( #{endDate}, #{startDate} )
         ) t
         LEFT JOIN (
         SELECT
         GROUP BY
         DATE_FORMAT( create_date, '%Y-%m-%d' )
         ) u ON t.date = u.create_date
+        ORDER BY
         <if test="sortField != null and sortField != ''">
-            ORDER BY ${sortField} ${orderType}
+             ${sortField} ${orderType},
         </if>
+        create_date
     </select>
 
 </mapper>

src/main/resources/mapper/TaRecommendCustomerMapper.xml

     </select>
 
     <select id="getCustomerListOfConsultant" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
-        select s.*, t.avatarurl
+        select s.*, t.avatarurl, s.report_date as visit_time
         from ta_recommend_customer s
         left join ta_person t on t.person_id = s.person_id
         where s.org_id = #{orgId}

src/main/resources/mapper/TsActivityDailyMapper.xml

         (
             SELECT
                 DATE_FORMAT(
-                    DATE_ADD( STR_TO_DATE( '2020-04-18', '%Y-%m-%d' ), INTERVAL rownum DAY ), '%Y-%m-%d' ) AS statis_date
+                    DATE_ADD( STR_TO_DATE( #{startDate}, '%Y-%m-%d' ), INTERVAL rownum DAY ), '%Y-%m-%d' ) AS statis_date
             FROM sequence
-            WHERE rownum < DATEDIFF(STR_TO_DATE( #{endDate}, '%Y-%m-%d' ), STR_TO_DATE( #{startDate}, '%Y-%m-%d' ))
+            WHERE rownum <= DATEDIFF(STR_TO_DATE( #{endDate}, '%Y-%m-%d' ), STR_TO_DATE( #{startDate}, '%Y-%m-%d' ))
         ) a
         LEFT JOIN (
             SELECT

src/main/resources/mapper/TsConsultantKpiMapper.xml

 
     <select id="getConsultantShareCustomers" resultType="com.huiju.estateagents.entity.TaPerson">
         SELECT
-        t.*
+            t.*,
+            e.create_date as visit_time
         FROM ta_share_person_from e
         INNER JOIN ta_person t ON t.person_id = e.person_id
         WHERE e.org_id = #{orgId}
         AND e.share_person = #{userId}
         AND (
-            e.target_type IN ( 'building_share', 'dynamic_share', 'group_share', 'h5_share', 'help_share', 'house_share', 'live_share', 'news_share', 'poster' )
+            e.target_type IN ( 'card_share', 'building_share', 'dynamic_share', 'group_share', 'h5_share', 'help_share', 'house_share', 'live_share', 'news_share', 'poster' )
             or ( e.target_type = 'share' and e.target_id = 'index' )
         )
         AND e.create_date BETWEEN #{startDate} and #{endDate}
         <if test="personId != null and personId !=''">
             AND t.person_id = #{personId}
         </if>
-        ORDER BY t.create_date DESC
+        ORDER BY f.visit_time DESC
     </select>
 
     <select id="getConsultantChatPersons" resultType="com.huiju.estateagents.entity.TaPerson">
         <!-- 没有设置 targetType 查询条件, 则只查询固定的几个 -->
         <if test="targetType == null or targetType ==''">
             AND (
-            t.tagert_type IN ( 'project', 'activity', 'group', 'h5', 'help', 'news', 'main' )
+            t.tagert_type IN ( 'consultant', 'project', 'activity', 'group', 'h5', 'help', 'news', 'main' )
             OR t.tagert_type like 'house%'
             OR t.tagert_type like 'live%'
             )
             AND e.share_person = #{userId}
             AND e.create_date BETWEEN #{startDate} and #{endDate}
             AND (
-                e.target_type IN ( 'building_share', 'dynamic_share', 'group_share', 'h5_share', 'help_share', 'house_share', 'live_share', 'news_share', 'poster' )
+                e.target_type IN ( 'card_share', 'building_share', 'dynamic_share', 'group_share', 'h5_share', 'help_share', 'house_share', 'live_share', 'news_share', 'poster' )
                 OR ( e.target_type = 'share' AND e.target_id = 'index' )
             )
             <!-- building_id 字段数据不全
         <!-- 没有设置 targetType 查询条件, 则只查询固定的几个 -->
         <if test="targetType == null or targetType ==''">
             AND (
-            e.target_type IN ( 'building_share', 'dynamic_share', 'group_share', 'h5_share', 'help_share', 'house_share', 'live_share', 'news_share', 'poster' )
+            e.target_type IN ( 'card_share', 'building_share', 'dynamic_share', 'group_share', 'h5_share', 'help_share', 'house_share', 'live_share', 'news_share', 'poster' )
             OR ( e.target_type = 'share' AND e.target_id = 'index' )
             )
         </if>