KPI

src/main/java/com/yunzhi/marketing/service/impl/TaPersonFromRecordServiceImpl.java

@@ -74,6 +74,8 @@ public class TaPersonFromRecordServiceImpl extends ServiceImpl<TaPersonFromRecor
     public void personFromStatistic() {
         List<TsPersonFromStatistic> list =  taPersonFromRecordMapper.getNowDataList();
         tsPersonFromStatisticMapper.deleteByData();
-        tsPersonFromStatisticMapper.insertStatisticList(list);
+        if (list.size() > 0){
+            tsPersonFromStatisticMapper.insertStatisticList(list);
+        }
     }
 }

src/main/resources/mapper/TsConsultantKpiMapper.xml

@@ -6,8 +6,8 @@
     <select id="stsKPIDaily" resultType="com.yunzhi.marketing.entity.TsConsultantKpi">
         SELECT * FROM (
             SELECT
-                1 AS serial_no,
-                '2020' AS statis_date,
+                t.serial_no,
+                SUBSTR(t.statis_date,1,4),
                 t.org_id,
                 t.building_id,
                 t.building_name,
@@ -27,15 +27,13 @@
                  where s.org_id = t.org_id and (s.realty_consultant = t.user_id or s.realty_consultant = m.person_id)
                  and (s.building_id = t.building_id or IFNULL(t.building_id, '') = '')
                  and s.status > 0
-<!--                 AND s.create_date BETWEEN STR_TO_DATE( #{startDate}, '%Y%m%d' )-->
-<!--                 AND  STR_TO_DATE(concat(#{endDate}, '235959'), '%Y%m%d%H%i%s')-->
                 ) as total_persons
             FROM
                 ts_consultant_kpi t
             LEFT JOIN ta_person m on m.org_id = #{orgId} and m.user_id = t.user_id
             WHERE
                 t.org_id = #{orgId}
-                AND t.statis_date BETWEEN #{startDate} AND #{endDate}
+                AND t.statis_date BETWEEN DATE_FORMAT(#{startDate}, '%Y%m%d' )  AND DATE_FORMAT(#{endDate}, '%Y%m%d' )
             <if test="buildingIds != null">
                 AND t.building_id in
                 <foreach item="buildingId" index="index" collection="buildingIds"
@@ -59,8 +57,8 @@
     <!-- 按照小程序分组统计, 注意查询与分组条件, 必须与之前的汇总，导出一致 -->
     <select id="stsKPITotalByOrg" resultType="com.yunzhi.marketing.entity.TsConsultantKpi">
         SELECT
-            1 AS serial_no,
-            '2020' AS statis_date,
+            t.serial_no,
+            SUBSTR(t.statis_date,1,4),
             t.org_id,
             '' as building_id,
             '-' as building_name,
@@ -82,7 +80,7 @@
             ts_consultant_kpi t
         WHERE
             t.org_id = #{orgId}
-            AND t.statis_date BETWEEN #{startDate} AND #{endDate}
+            AND t.statis_date BETWEEN DATE_FORMAT(#{startDate}, '%Y%m%d' )  AND DATE_FORMAT(#{endDate}, '%Y%m%d' )
         <if test="buildingIds != null">
             AND t.building_id in
             <foreach item="buildingId" index="index" collection="buildingIds"
@@ -95,8 +93,8 @@
     <!-- 导出 -->
     <select id="stsKPIDailyExport" resultType="com.yunzhi.marketing.excel.ConsultantKPIExport">
         SELECT
-            1 AS serial_no,
-            '2020' AS statis_date,
+            t.serial_no,
+            SUBSTR(t.statis_date,1,4),
             t.org_id,
             t.building_id,
             t.building_name,
@@ -119,7 +117,7 @@
         LEFT JOIN ta_person m on m.org_id = #{orgId} and m.user_id = t.user_id
         WHERE
             t.org_id = #{orgId}
-        AND t.statis_date BETWEEN #{startDate} AND #{endDate}
+        AND t.statis_date BETWEEN DATE_FORMAT(#{startDate}, '%Y%m%d' )  AND DATE_FORMAT(#{endDate}, '%Y%m%d' )
     <if test="buildingIds != null">
         AND t.building_id in
         <foreach item="buildingId" index="index" collection="buildingIds"
@@ -146,8 +144,6 @@
         WHERE
             p.org_id = #{orgId}
             AND p.`status` > 0
-<!--            AND p.create_date BETWEEN STR_TO_DATE( #{startDate}, '%Y%m%d')-->
-<!--            AND  STR_TO_DATE(concat(#{endDate}, '235959'), '%Y%m%d%H%i%s')-->
         <if test="buildingIds != null">
             AND t.building_id in
             <foreach item="buildingId" index="index" collection="buildingIds"
@@ -169,7 +165,7 @@
             AND e.building_id = #{buildingId}
         </if>
         AND e.target_type is not null
-        AND e.create_date BETWEEN #{startDate} and #{endDate}
+        AND e.create_date BETWEEN DATE_FORMAT(#{startDate}, '%Y%m%d' )  AND DATE_FORMAT(#{endDate}, '%Y%m%d' )
         AND e.is_project_first = 1
         AND s.user_id = #{userId}
 
@@ -197,7 +193,7 @@
             AND f.building_id = #{buildingId}
         </if>
             AND f.event_type = 'card'
-            AND f.visit_time BETWEEN #{startDate} and #{endDate}
+            AND f.visit_time BETWEEN DATE_FORMAT(#{startDate}, '%Y%m%d' )  AND DATE_FORMAT(#{endDate}, '%Y%m%d' )
             AND s.user_id = #{userId}
 
 <!--        为了与存储过程一致 -->
@@ -222,7 +218,7 @@
             AND f.building_id = #{buildingId}
         </if>
             AND f.event_type = 'card'
-            AND f.visit_time BETWEEN #{startDate} and #{endDate}
+            AND f.visit_time BETWEEN DATE_FORMAT(#{startDate}, '%Y%m%d' )  AND DATE_FORMAT(#{endDate}, '%Y%m%d' )
             AND s.user_id = #{userId}
 
 <!--        为了与存储过程一致 -->
@@ -245,7 +241,7 @@
 
 <!--        为了与存储过程一致 -->
 <!--            AND t.`status` = 1-->
-            AND h.create_date BETWEEN #{startDate} and #{endDate}
+            AND h.create_date BETWEEN DATE_FORMAT(#{startDate}, '%Y%m%d' )  AND DATE_FORMAT(#{endDate}, '%Y%m%d' )
             AND s.user_id = #{userId}
 
 <!--        为了与存储过程一致 -->
@@ -269,7 +265,7 @@
 <!--        为了与存储过程一致 -->
 <!--            AND t.`status` = 1-->
             AND i.tagert_type = 'consultant'
-            AND i.create_date BETWEEN #{startDate} and #{endDate}
+            AND i.create_date BETWEEN DATE_FORMAT(#{startDate}, '%Y%m%d' )  AND DATE_FORMAT(#{endDate}, '%Y%m%d' )
             AND s.user_id = #{userId}
 
 <!--        为了与存储过程一致 -->
@@ -306,7 +302,7 @@
             AND t.tagert_type like concat(#{targetType}, '%')
         </if>
 
-            AND t.create_date BETWEEN #{startDate} and #{endDate}
+            AND t.create_date BETWEEN DATE_FORMAT(#{startDate}, '%Y%m%d' )  AND DATE_FORMAT(#{endDate}, '%Y%m%d' )
         <if test="targetName != null and targetName !=''">
             AND t.target_name LIKE concat('%', #{targetName}, '%')
         </if>
@@ -326,7 +322,7 @@
         INNER JOIN ta_person t ON t.person_id = e.person_id
         WHERE e.org_id = #{orgId}
             AND e.share_person = #{userId}
-            AND e.create_date BETWEEN #{startDate} and #{endDate}
+            AND e.create_date BETWEEN DATE_FORMAT(#{startDate}, '%Y%m%d' )  AND DATE_FORMAT(#{endDate}, '%Y%m%d' )
             AND (
                 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' )
@@ -371,7 +367,7 @@
             AND e.target_name like concat('%', #{targetName} ,'%')
         </if>
 
-            AND e.create_date BETWEEN #{startDate} and #{endDate}
+            AND e.create_date BETWEEN DATE_FORMAT(#{startDate}, '%Y%m%d' )  AND DATE_FORMAT(#{endDate}, '%Y%m%d' )
 
         <if test="buildingId != null and buildingId !=''">
             AND e.building_id = #{buildingId}