合伙人APP 统计

src/main/java/com/ydtech/modules/admin/service/impl/SysPartnerServiceImpl.java

@@ -1915,14 +1915,15 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
         List<CountUserNumVo> countUserNumVoList = null;
         int type = countUserDto.getType();
         if (type == 1) {
-            if (StringUtils.isNotEmpty(startTime1) && startTime1.equals(endTime1)) {
+
+            if (StringUtils.isNotEmpty(startTime1) && startTime1.split("")[0].equals(endTime1.split("")[0])) {
                 countUserNumVoList = sysPartnerMapper.queryDeptByTimes(userId,countUserDto);
             }else {
                 countUserNumVoList = sysPartnerMapper.queryDeptByTime(userId,countUserDto);
             }
         }else {
             List<String> deptIds = sysUsers.stream().map(SysUser::getDeptId).collect(Collectors.toList());
-            if (StringUtils.isNotEmpty(startTime1) && startTime1.equals(endTime1)){
+            if (StringUtils.isNotEmpty(startTime1) && startTime1.split("")[0].equals(endTime1.split("")[0])){
 
                 countUserNumVoList = sysPartnerMapper.queryUserByTimes(deptIds,countUserDto);
             }else {

src/main/resources/mapper/modules/admin/SysPartnerMapper.xml

@@ -78,10 +78,10 @@
 
 
     <select id="queryDeptByTimes" resultType="com.ydtech.modules.admin.model.vo.CountUserNumVo">
-        select spa.time, COUNT(spa.user_id) as countNum
+        select spa.time, COUNT(spa.id) as countNum
         from(
         SELECT
-            s.user_id,DATE_FORMAT(s.create_time, '%Y-%m-%d %H' ) as time
+            s.id,DATE_FORMAT(s.create_time, '%Y-%m-%d %H' ) as time
         FROM sys_user  s
         <where>
             s.type = 3 and s.status in (1, 4, 5, 6, 7)
@@ -89,7 +89,7 @@
                 and s.referrer_id = #{userId}
             </if>
             <if test="dto.beginTime != null and dto.beginTime != '' and dto.endTime != null and dto.endTime != ''">
-                and (DATE_FORMAT(s.create_time, '%Y-%m-%d' ) like CONCAT( DATE_FORMAT( #{dto.startTime}, '%Y-%m-%d' ), '%' ))
+                and (DATE_FORMAT(s.create_time, '%Y-%m-%d' ) like CONCAT( DATE_FORMAT( #{dto.beginTime}, '%Y-%m-%d' ), '%' ))
             </if>
         </where>
         ) as spa
@@ -100,10 +100,10 @@
     </select>
 
     <select id="queryDeptByTime" resultType="com.ydtech.modules.admin.model.vo.CountUserNumVo">
-        select spa.time, COUNT(spa.user_id) as countNum
+        select spa.time, COUNT(spa.id) as countNum
         from(
         SELECT
-            s.user_id,DATE_FORMAT(s.create_time, '%Y-%m-%d' ) as time
+            s.id,DATE_FORMAT(s.create_time, '%Y-%m-%d' ) as time
         FROM sys_user  s
         <where>
             s.type = 3 and s.status in (1, 4, 5, 6, 7)
@@ -122,10 +122,10 @@
     </select>
 
     <select id="queryUserByTimes" resultType="com.ydtech.modules.admin.model.vo.CountUserNumVo">
-        select spa.time, COUNT(spa.user_id) as countNum
+        select spa.time, COUNT(spa.id) as countNum
         from(
         SELECT
-            s.user_id,DATE_FORMAT(s.create_time, '%Y-%m-%d %H' ) as time
+            s.id,DATE_FORMAT(s.create_time, '%Y-%m-%d %H' ) as time
         FROM sys_user  s
         <where>
             s.status in (1, 4, 5, 6, 7)
@@ -136,7 +136,7 @@
                 </foreach>
             </if>
             <if test="dto.beginTime != null and dto.beginTime != '' and dto.endTime != null and dto.endTime != ''">
-                and (DATE_FORMAT(s.create_time, '%Y-%m-%d' ) like CONCAT( DATE_FORMAT( #{dto.startTime}, '%Y-%m-%d' ), '%' ))
+                and (DATE_FORMAT(s.create_time, '%Y-%m-%d' ) like CONCAT( DATE_FORMAT( #{dto.beginTime}, '%Y-%m-%d' ), '%' ))
             </if>
         </where>
         ) as spa
@@ -148,10 +148,10 @@
     </select>
 
     <select id="queryUserByTime" resultType="com.ydtech.modules.admin.model.vo.CountUserNumVo">
-        select spa.time, COUNT(spa.user_id) as countNum
+        select spa.time, COUNT(spa.id) as countNum
         from(
         SELECT
-            s.user_id,DATE_FORMAT(s.create_time, '%Y-%m-%d' ) as time
+            s.id,DATE_FORMAT(s.create_time, '%Y-%m-%d' ) as time
         FROM sys_user  s
         <where>
             s.status in (1, 4, 5, 6, 7)