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

src/main/resources/mapper/TsActivityDailyMapper.xml

@@ -4,42 +4,67 @@
 
     <select id="getActivityDetail" resultType="com.huiju.estateagents.entity.TsActivityDaily">
         SELECT
-            t.statis_date,
-            SUM(t.share_num) as share_num,
-            SUM(t.share_persons) as share_persons,
-            SUM(t.visit_num) as visit_num,
-            SUM(t.visit_persons) as visit_persons,
-            SUM(t.new_persons) as new_persons,
-            SUM(t.new_customers) as new_customers
+            a.statis_date,
+            IFNULL(b.share_num, 0) as share_num,
+            IFNULL(b.share_persons, 0) as share_persons,
+            IFNULL(b.visit_num, 0) as visit_num,
+            IFNULL(b.visit_persons, 0) as visit_persons,
+            IFNULL(b.new_persons, 0) as new_persons,
+            IFNULL(b.new_customers, 0) as new_customers
         FROM
-            ts_activity_daily t
-        WHERE
-            t.org_id = #{orgId}
-            AND t.statis_date BETWEEN #{startDate} AND #{endDate}
+        (
+            SELECT
+                DATE_FORMAT(
+                    DATE_ADD( STR_TO_DATE( '2020-04-18', '%Y-%m-%d' ), INTERVAL rownum DAY ), '%Y-%m-%d' ) AS statis_date
+            FROM sequence
+            WHERE rownum &lt; DATEDIFF(STR_TO_DATE( #{endDate}, '%Y-%m-%d' ), STR_TO_DATE( #{startDate}, '%Y-%m-%d' ))
+        ) a
+        LEFT JOIN (
+            SELECT
+                t.statis_date,
+                SUM(t.share_num) as share_num,
+                SUM(t.share_persons) as share_persons,
+                SUM(t.visit_num) as visit_num,
+                SUM(t.visit_persons) as visit_persons,
+                SUM(t.new_persons) as new_persons,
+                SUM(t.new_customers) as new_customers
+            FROM
+                ts_activity_daily t
+            WHERE
+                t.org_id = #{orgId}
+                AND t.statis_date BETWEEN #{startDate} AND #{endDate}
 
-        <if test="buildingId != null and buildingId != ''">
-            AND t.building_id = #{buildingId}
-        </if>
+            <if test="buildingId != null and buildingId != ''">
+                AND t.building_id = #{buildingId}
+            </if>
 
-        <if test="targetType != null and targetType != ''">
-            AND t.target_type = #{targetType}
-        </if>
+            <if test="targetType != null and targetType != ''">
+                AND t.target_type = #{targetType}
+            </if>
 
-        <if test="targetId != null and targetId != ''">
-            AND t.target_id = #{targetId}
-        </if>
+            <if test="targetId != null and targetId != ''">
+                AND t.target_id = #{targetId}
+            </if>
 
-        <if test="targetName != null and targetName != ''">
-            AND t.target_name like CONCAT('%', #{targetName}, '%')
-        </if>
+            <if test="targetName != null and targetName != ''">
+                AND t.target_name like CONCAT('%', #{targetName}, '%')
+            </if>
+
+            GROUP BY t.statis_date
+        ) b ON a.statis_date = b.statis_date
 
-        GROUP BY t.statis_date
+        <if test="asc != null and asc == 'statis_date'">
+            ORDER BY a.statis_date ASC
+        </if>
+        <if test="desc != null and desc == 'statis_date'">
+            ORDER BY a.statis_date DESC
+        </if>
 
-        <if test="asc != null and asc != ''">
-            ORDER BY ${asc} ASC
+        <if test="asc != null and asc != '' and asc != 'statis_date'">
+            ORDER BY b.${asc} ASC
         </if>
-        <if test="desc != null and desc != ''">
-            ORDER BY ${desc} DESC
+        <if test="desc != null and desc != '' and desc != 'statis_date'">
+            ORDER BY b.${desc} DESC
         </if>
     </select>
 

src/main/resources/mapper/TsConsultantKpiMapper.xml

@@ -362,6 +362,9 @@
             AND e.target_type = 'share'
             AND e.target_id = 'index'
         </if>
+        <if test="targetName != null and targetName !=''">
+            AND e.target_name like concat('%', #{targetName} ,'%')
+        </if>
 
             AND e.create_date BETWEEN #{startDate} and #{endDate}
             <!-- building_id 字段数据不全
@@ -374,7 +377,7 @@
             AND t.person_id = #{personId}
         </if>
         <if test="userName != null and userName !=''">
-            AND t.nickname like concat('%', #{userName} ,'%')
+            AND IFNULL(t.name, t.nickname) like concat('%', #{userName} ,'%')
         </if>
             <!--            AND t.`status` = 1-->
         ORDER BY e.create_date DESC