提交

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

@@ -52,21 +52,19 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
 
     /**
      * 总用户数
-     * @param personType
      * @return
      */
     @ResultType(Integer.class)
-    @Select("select count(1) from ta_person where org_id = #{org} AND ifnull(person_type, '') != #{personType}")
-    Integer selectUserCount(@Param("org") Integer orgId, @Param("personType") String personType);
+    @Select("select count(1) from ta_person where org_id = #{org} AND person_type IN ('customer','drift','estate agent')")
+    Integer selectUserCount(@Param("org") Integer orgId);
 
     /**
      * 总注册数
-     * @param personType
      * @return
      */
     @ResultType(Integer.class)
-    @Select("select count(1) from ta_person where org_id = #{org} AND ifnull(person_type, '') != #{personType} and phone is not null")
-    Integer selectRegisteredCount(@Param("org") Integer orgId, @Param("personType") String personType);
+    @Select("select count(1) from ta_person where org_id = #{org} AND person_type IN ('customer','drift','estate agent') and phone is not null")
+    Integer selectRegisteredCount(@Param("org") Integer orgId);
 
     /**
      * 根据时间段查询
@@ -115,11 +113,10 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
      *
      *  据说 1 男  2 女
      *
-     * @param personType
      * @return
      */
-    @Select("select count(1) as sex_count from ta_person where org_id = #{org} AND ifnull(person_type, '') != #{personType} and gender = #{gender}")
-    Integer selectSexUser(@Param("org") Integer orgId, @Param("personType") String personType, @Param("gender") Integer gender);
+    @Select("select count(1) as sex_count from ta_person where org_id = #{org} AND person_type IN ('customer','drift','estate agent')  and gender = #{gender}")
+    Integer selectSexUser(@Param("org") Integer orgId, @Param("gender") Integer gender);
 
 
     /**
@@ -140,10 +137,10 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
             "on a.city = b.id " +
             "WHERE " +
             "   a.org_id = #{org} " +
-            "	AND ifnull(a.person_type, '') != #{personType} " +
+            "	AND a.person_type IN ('customer','drift','estate agent')  " +
             "GROUP BY " +
             "	a.city ")
-    List<Map<String, Object>> selectCityUser(@Param("org") Integer orgId, @Param("personType") String personType);
+    List<Map<String, Object>> selectCityUser(@Param("org") Integer orgId);
 
 
     // ------------- 用户来源 start ------------

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

@@ -52,10 +52,10 @@ public class StatisticalServiceImpl implements IStatisticalService {
         Map<String,Object> map = new HashMap<>();
 
         // 总用户数
-        Integer selectUserCount = taPersonMapper.selectUserCount(orgId, CommConstant.PERSON_REALTY_CONSULTANT);
+        Integer selectUserCount = taPersonMapper.selectUserCount(orgId);
 
         // 注册数
-        Integer selectRegisteredCount = taPersonMapper.selectRegisteredCount(orgId, CommConstant.PERSON_REALTY_CONSULTANT);
+        Integer selectRegisteredCount = taPersonMapper.selectRegisteredCount(orgId);
 
         // 最近七天
         Integer selectRecentlyCount = taPersonMapper.selectRecentlyCount(orgId, CommConstant.PERSON_REALTY_CONSULTANT, null, null);
@@ -71,8 +71,8 @@ public class StatisticalServiceImpl implements IStatisticalService {
 
         // 性别比例
         // 1 男 2 女
-        Integer selectSexMale = taPersonMapper.selectSexUser(orgId, CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.SEX_MALE);
-        Integer selectSexFemale = taPersonMapper.selectSexUser(orgId, CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.SEX_FEMALE);
+        Integer selectSexMale = taPersonMapper.selectSexUser(orgId, CommConstant.SEX_MALE);
+        Integer selectSexFemale = taPersonMapper.selectSexUser(orgId, CommConstant.SEX_FEMALE);
         Map<String, Object> selectSexMaleMap = new HashMap<>();
         selectSexMaleMap.put("name", "男");
         selectSexMaleMap.put("value", selectSexMale);
@@ -84,7 +84,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
         selectSexUser.add(selectSexFemaleMap);
 
         // 城市比例
-        List<Map<String, Object>> selectCityUser = taPersonMapper.selectCityUser(orgId, CommConstant.PERSON_REALTY_CONSULTANT);
+        List<Map<String, Object>> selectCityUser = taPersonMapper.selectCityUser(orgId);
 
         // 转化率, 当前 默认项目收藏
         Map<String, Object> selectBuildingStatistical = taBuildingMapper.selectBuildingStatistical(orgId, "save");
@@ -235,10 +235,10 @@ public class StatisticalServiceImpl implements IStatisticalService {
 
             case CommConstant.AUTHORIZATION_PHONE:
                 // 总用户数
-                Integer selectUserCount = taPersonMapper.selectUserCount(orgId, CommConstant.PERSON_REALTY_CONSULTANT);
+                Integer selectUserCount = taPersonMapper.selectUserCount(orgId);
 
                 // 注册数
-                Integer selectRegisteredCount = taPersonMapper.selectRegisteredCount(orgId, CommConstant.PERSON_REALTY_CONSULTANT);
+                Integer selectRegisteredCount = taPersonMapper.selectRegisteredCount(orgId);
                 Map<String, Object> userMap = new HashMap<>();
                 userMap.put("pvNum", selectUserCount);
                 userMap.put("registeredCount", selectRegisteredCount);
@@ -284,7 +284,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
     public ResponseBean selectUserCount(Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
         // 总用户数
-        Integer selectUserCount = taPersonMapper.selectUserCount(orgId, CommConstant.PERSON_REALTY_CONSULTANT);
+        Integer selectUserCount = taPersonMapper.selectUserCount(orgId);
         Map<String, Object> map = new HashMap<>();
         map.put("selectUserCount", selectUserCount);
         responseBean.addSuccess(map);
@@ -295,7 +295,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
     public ResponseBean selectRegisteredCount(Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
         // 注册数
-        Integer selectRegisteredCount = taPersonMapper.selectRegisteredCount(orgId, CommConstant.PERSON_REALTY_CONSULTANT);
+        Integer selectRegisteredCount = taPersonMapper.selectRegisteredCount(orgId);
         Map<String, Object> map = new HashMap<>();
         map.put("selectRegisteredCount", selectRegisteredCount);
         responseBean.addSuccess(map);
@@ -319,8 +319,8 @@ public class StatisticalServiceImpl implements IStatisticalService {
 
         // 性别比例
         // 1 男 2 女
-        Integer selectSexMale = taPersonMapper.selectSexUser(orgId, CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.SEX_MALE);
-        Integer selectSexFemale = taPersonMapper.selectSexUser(orgId, CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.SEX_FEMALE);
+        Integer selectSexMale = taPersonMapper.selectSexUser(orgId, CommConstant.SEX_MALE);
+        Integer selectSexFemale = taPersonMapper.selectSexUser(orgId, CommConstant.SEX_FEMALE);
         Map<String, Object> selectSexMaleMap = new HashMap<>();
         selectSexMaleMap.put("name", "男");
         selectSexMaleMap.put("value", selectSexMale);
@@ -342,7 +342,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
         ResponseBean responseBean = new ResponseBean();
 
         // 城市比例
-        List<Map<String, Object>> selectCityUser = taPersonMapper.selectCityUser(orgId, CommConstant.PERSON_REALTY_CONSULTANT);
+        List<Map<String, Object>> selectCityUser = taPersonMapper.selectCityUser(orgId);
         Map<String, Object> map = new HashMap<>();
         map.put("selectCityUser", selectCityUser);
         responseBean.addSuccess(map);

src/main/resources/mapper/TaPersonMapper.xml

@@ -157,7 +157,7 @@ FROM
         FROM
         ta_person tp
         where tp.org_id = #{org} AND
-          ifnull(tp.person_type, '') != #{personType}
+        tp.person_type IN ('customer','drift','estate agent')
 
         <if test="startDate != null or endDate != null">
             AND  tp.create_date BETWEEN #{startDate} and #{endDate}
@@ -196,7 +196,7 @@ FROM
             FROM
               ta_person tp
             INNER JOIN ta_person_visit_record tpvr ON tp.person_id = tpvr.person_id
-            where tp.org_id = #{org} AND ifnull(tp.person_type, '') != #{personType}
+            where tp.org_id = #{org} AND tp.person_type IN ('customer','drift','estate agent')
             <if test="buildingId != null and buildingId != ''">
                 and tpvr.building_id = #{buildingId}
             </if>
@@ -254,7 +254,7 @@ FROM
              LEFT JOIN
             ( SELECT *, MAX(visit_time) as max_visit_time FROM ta_person_visit_record GROUP BY  person_id  ) as tpvr
             ON tp.person_id = tpvr.person_id
-             where tp.org_id = #{org} AND ifnull(tp.person_type, '') != #{personType}
+             where tp.org_id = #{org} AND tp.person_type IN ('customer','drift','estate agent')
              GROUP BY DATE_FORMAT( tpvr.max_visit_time , '%Y-%m-%d' )
         ) AS temp ON
         <if test="dateType == 'month'.toString()">
@@ -297,7 +297,7 @@ FROM
                         tp.create_date as create_date
                     FROM
                       ta_person tp
-                    where ifnull(tp.person_type, '') != #{personType} and tp.org_id = #{orgId}
+                    where tp.person_type IN ('customer','drift','estate agent') and tp.org_id = #{orgId}
                     and tp.phone is NOT NULL
                     <if test="startDate != null or endDate != null">
                         AND tp.create_date BETWEEN #{startDate} and #{endDate}
@@ -335,7 +335,7 @@ FROM
                     tp.create_date as create_date
                 FROM
                  ta_person tp
-                where ifnull(tp.person_type, '') != #{personType} and tp.org_id = #{orgId}
+                where tp.person_type IN ('customer','drift','estate agent') and tp.org_id = #{orgId}
                 <if test="startDate != null or endDate != null">
                     AND tp.create_date BETWEEN #{startDate} and #{endDate}
                 </if>
@@ -355,8 +355,7 @@ FROM
     <select id="selectUserSourcePie" resultType="integer">
         select count(1)
         FROM ta_person
-        WHERE org_id = #{org} AND
-          ifnull(person_type, '') != #{personType}
+        WHERE org_id = #{org} AND person_type IN ('customer','drift','estate agent')
         <if test="recommendPersonType != null and recommendPersonType != ''">
             and recommend_person_type = #{recommendPersonType}
         </if>
@@ -373,7 +372,7 @@ FROM
             ON tps.from_code = tpfs.from_code
             WHERE tpfs.from_code = tpf.from_code and tps.phone is NOT NULL
             AND tps.org_id = #{org}
-            and ifnull(tps.person_type, '') != #{personType}
+            and tps.person_type IN ('customer','drift','estate agent')
             <if test="startDate != null or endDate != null">
                 and tps.create_date BETWEEN #{startDate} and #{endDate}
             </if>
@@ -389,7 +388,7 @@ FROM
             ON tps.from_code = tpfs.from_code
             WHERE tpfs.from_code = tpf.from_code
             AND tps.org_id = #{org}
-            and ifnull(tps.person_type, '') != #{personType}
+            and tps.person_type IN ('customer','drift','estate agent')
             <if test="startDate != null or endDate != null">
                 and tps.create_date BETWEEN #{startDate} and #{endDate}
             </if>
@@ -401,7 +400,7 @@ FROM
         FROM td_person_from tpf
         LEFT JOIN ta_person tp
         ON tp.from_code = tpf.from_code
-        where tp.org_id = #{org} AND ifnull(tp.person_type, '') != #{personType}
+        where tp.org_id = #{org} AND tp.person_type IN ('customer','drift','estate agent')
         GROUP BY tpf.from_code
     </select>
 
@@ -445,7 +444,7 @@ FROM
             ON tps.from_code = tpfs.from_code
             WHERE tpfs.from_code = tps.from_code
             AND tps.org_id = #{org}
-            and ifnull(tps.person_type, '') != 'Realty Consultant'
+            and tps.person_type IN ('customer','drift','estate agent')
             AND tps.create_date BETWEEN #{startDate} AND #{endDate}
 
             GROUP BY tpfs.from_code
@@ -463,7 +462,7 @@ FROM
             ON tps.from_code = tpfs.from_code
             WHERE tpfs.from_code = tps.from_code
                 AND tps.org_id = #{org}
-                and ifnull(tps.person_type, '') != 'Realty Consultant'
+                and tps.person_type IN ('customer','drift','estate agent')
                 AND tps.create_date BETWEEN #{startDate} AND #{endDate}
                 and tps.phone is not null
             GROUP BY tpfs.from_code