用户来源 data数据列表 增加registered字段值

src/main/resources/mapper/TaPersonMapper.xml

@@ -366,29 +366,32 @@ FROM
     </select>
 
     <select id="selectUserSourceData" resultType="map">
+
         select
             temp_date.date AS date,
             temp_date.from_name as from_name,
             temp_date.from_code as from_code,
             IFNULL(user_count.count, 0) as count,
+            IFNULL(registered_count.count,0) as registered,
             user_count.create_date as create_date
         FROM
         (
             SELECT
-                DATE_FORMAT( DATE_SUB( now( ), INTERVAL a.rownum DAY ), '%Y-%m-%d' ) AS date,
-                tempf.from_name as from_name,
-                tempf.from_code as from_code
+            DATE_FORMAT( DATE_SUB( now( ), INTERVAL a.rownum DAY ), '%Y-%m-%d' ) AS date,
+            tempf.from_name as from_name,
+            tempf.from_code as from_code
             FROM
-                sequence a
-                ,
-                td_person_from tempf
+            sequence a
+            ,
+            td_person_from tempf
             WHERE
-            <if test="startDate == null or endDate == null">
-                a.rownum <![CDATA[ <= ]]> 7
-            </if>
-            <if test="startDate != null or endDate != null">
-                a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
-            </if>
+
+                <if test="startDate == null or endDate == null">
+                    a.rownum <![CDATA[ <= ]]> 7
+                </if>
+                <if test="startDate != null or endDate != null">
+                    a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
+                </if>
 
         ) AS temp_date
 
@@ -403,13 +406,27 @@ FROM
             LEFT JOIN td_person_from tpfs
             ON tps.from_code = tpfs.from_code
             WHERE tpfs.from_code = tps.from_code
-            and ifnull(tps.person_type, '') != #{personType}
-            <if test="registeredType == 'registered' and registeredType != ''">
-                and tps.phone is not null
-            </if>
+            and ifnull(tps.person_type, '') != 'Realty Consultant'
+
             GROUP BY tpfs.from_code
         ) as user_count
         ON DATE_FORMAT(user_count.create_date,'%Y-%m-%d') =  temp_date.date and temp_date.from_code = user_count.from_code
+        LEFT JOIN
+        (
+            SELECT
+                ifnull(COUNT(1), 0) as count,
+                tps.create_date as create_date,
+                tpfs.from_code as from_code,
+                tpfs.from_name as from_name
+            FROM ta_person tps
+            LEFT JOIN td_person_from tpfs
+            ON tps.from_code = tpfs.from_code
+            WHERE tpfs.from_code = tps.from_code
+                and ifnull(tps.person_type, '') != 'Realty Consultant'
+                and tps.phone is not null
+            GROUP BY tpfs.from_code
+        ) as registered_count
+        ON DATE_FORMAT(user_count.create_date,'%Y-%m-%d') =  temp_date.date and temp_date.from_code = registered_count.from_code
         order by temp_date.date DESC
     </select>