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

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

@@ -228,10 +228,10 @@ public class StatisticalServiceImpl implements IStatisticalService {
 
                 // 注册数
                 Integer selectRegisteredCount = taPersonMapper.selectRegisteredCount(CommConstant.PERSON_REALTY_CONSULTANT);
-                Map<String, Object> user = new HashMap<>();
-                user.put("user_count", selectUserCount);
-                user.put("registered_count", selectRegisteredCount);
-                result.put("data_count", selectRegisteredCount);
+                Map<String, Object> userMap = new HashMap<>();
+                userMap.put("pvNum", selectUserCount);
+                userMap.put("registeredCount", selectRegisteredCount);
+                result.put("data_count", userMap);
                 break;
         }
 

src/main/resources/mapper/TaPersonMapper.xml

@@ -199,7 +199,7 @@ FROM
         ta_person tp
         INNER JOIN ta_person_visit_record tpvr ON tp.person_id = tpvr.person_id
         where ifnull(tp.person_type, '') != #{personType}
-        GROUP BY tpvr.person_id, tpvr.event_type, DATE_FORMAT( tpvr.visit_time , '%Y-%m-%d' )
+        GROUP BY  tpvr.event_type, DATE_FORMAT( tpvr.visit_time , '%Y-%m-%d' )
         ) AS temp ON temp_date.date = temp.date and temp_date.type_id = temp.event_type
     </select>