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

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

@@ -86,9 +86,8 @@ public class StatisticalController {
      */
     @GetMapping(value = "/admin/selectUserResource")
     public ResponseBean selectUserResource(@RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
-                                           @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)  LocalDate endDate,
-                                           @RequestParam(value = "registeredType", required = false) String registeredType) {
-        return iStatisticalService.selectUserResource(startDate, endDate, registeredType);
+                                           @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)  LocalDate endDate) {
+        return iStatisticalService.selectUserResource(startDate, endDate);
     }
 
 

src/main/java/com/huiju/estateagents/mapper/TaPersonMapper.java

@@ -145,7 +145,7 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
     /**
      * 用户来源 数据列表
      */
-    List<Map<String,Object>> selectUserSourceData(@Param("personType") String personType, @Param("startDate")LocalDate startDate, @Param("endDate")LocalDate endDate, @Param("registeredType") String registeredType);
+    List<Map<String,Object>> selectUserSourceData(@Param("personType") String personType, @Param("startDate")LocalDate startDate, @Param("endDate")LocalDate endDate);
 
     // ------------- 用户来源 end ------------
 

src/main/java/com/huiju/estateagents/service/IStatisticalService.java

@@ -90,7 +90,7 @@ public interface IStatisticalService {
      * 用户来源 首页
      * @return
      */
-    ResponseBean selectUserResource(LocalDate startDate, LocalDate endDate, String registeredType);
+    ResponseBean selectUserResource(LocalDate startDate, LocalDate endDate);
 
     /**
      * 意向用户 首页

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

@@ -244,7 +244,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
 
 
     @Override
-    public ResponseBean selectUserResource(LocalDate startDate, LocalDate endDate, String registeredType) {
+    public ResponseBean selectUserResource(LocalDate startDate, LocalDate endDate) {
         ResponseBean responseBean = new ResponseBean();
         // 用户来源 柱状
         List<Map<String, Object>> mapList = taPersonMapper.selectUserSourceColumnar(CommConstant.PERSON_REALTY_CONSULTANT, startDate, endDate);
@@ -260,7 +260,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
         map.put("person_null", person_null);
 
         // 用户来源 数据列表
-        List<Map<String, Object>> selectUserSourceData = taPersonMapper.selectUserSourceData(CommConstant.PERSON_ESTATE_AGENT, startDate, endDate, registeredType);
+        List<Map<String, Object>> selectUserSourceData = taPersonMapper.selectUserSourceData(CommConstant.PERSON_ESTATE_AGENT, startDate, endDate);
 
         Map<String, Object> result = new HashMap<>();
         result.put("columnar", mapList);

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,28 @@ 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>
 
 </mapper>