统计修改

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -293,7 +293,6 @@ public class CommConstant {
      */
     public static final String AUTHORIZATION_PHONE = "authorization_phone";
 
-
     // ------   转化率 end ---------
 
 
@@ -302,4 +301,10 @@ public class CommConstant {
     public static final String REGISTERED_TYPE = "registered";
 
     // ------- 用户来源 查询条件 end ----------
+
+    // ------- 性别 start -------
+    // 据说 1 男 2 女
+    public static final Integer SEX_MALE = 1;
+    public static final Integer SEX_FEMALE = 2;
+    // ------- 性别 start -------
 }

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

@@ -107,11 +107,14 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
 
     /**
      * 性别比例
+     *
+     *  据说 1 男  2 女
+     *
      * @param personType
      * @return
      */
-    @Select("select sex, count(1) as sex_count from ta_person where ifnull(person_type, '') != #{personType} GROUP BY sex")
-    List<Map<String, Object>> selectSexUser(@Param("personType") String personType);
+    @Select("select count(1) as sex_count from ta_person where ifnull(person_type, '') != #{personType} and sex = #{sex}")
+    Integer selectSexUser(@Param("personType") String personType, @Param("sex") Integer sex);
 
 
     /**
@@ -120,7 +123,7 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
      * @return
      */
     @ResultType(Map.class)
-    @Select("select city, count(1) as city_count  from ta_person where ifnull(person_type, '') != #{personType} GROUP BY city")
+    @Select("select city, count(1) as city_count  from ta_person where ifnull(person_type, '') != #{personType} and city is not null GROUP BY city")
     List<Map<String, Object>> selectCityUser(@Param("personType") String personType);
 
 

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

@@ -15,10 +15,7 @@ import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 数据统计
@@ -70,7 +67,18 @@ public class StatisticalServiceImpl implements IStatisticalService {
         List<Map<String, Object>> selectNewsUserCount = taPersonMapper.selectNewsUserCount(CommConstant.PERSON_REALTY_CONSULTANT, null, null);
 
         // 性别比例
-        List<Map<String, Object>> selectSexUser = taPersonMapper.selectSexUser(CommConstant.PERSON_REALTY_CONSULTANT);
+        // 1 男 2 女
+        Integer selectSexMale = taPersonMapper.selectSexUser(CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.SEX_MALE);
+        Integer selectSexFemale = taPersonMapper.selectSexUser(CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.SEX_FEMALE);
+        Map<String, Object> selectSexMaleMap = new HashMap<>();
+        selectSexMaleMap.put("name", "男");
+        selectSexMaleMap.put("value", selectSexMale);
+        Map<String, Object> selectSexFemaleMap = new HashMap<>();
+        selectSexFemaleMap.put("name", "女");
+        selectSexFemaleMap.put("value", selectSexFemale);
+        List<Map<String, Object>> selectSexUser = new ArrayList<>();
+        selectSexUser.add(selectSexMaleMap);
+        selectSexUser.add(selectSexFemaleMap);
 
         // 城市比例
         List<Map<String, Object>> selectCityUser = taPersonMapper.selectCityUser(CommConstant.PERSON_REALTY_CONSULTANT);