update

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TenantPersonStatServiceImpl.java

@@ -61,7 +61,9 @@ public class TenantPersonStatServiceImpl extends ServiceImpl<TenantPersonStatMap
                 dtos.add(dateMap.get(date));
             } else {
                 // 如果不存在对应日期的数据
-                dtos.add(new TenantPersonStatWrapper.TenantPersonStatDto(date));
+                TenantPersonStatWrapper.TenantPersonStatDto dto = new TenantPersonStatWrapper.TenantPersonStatDto();
+                dto.setDate(date);
+                dtos.add(dto);
             }
         }
         return new TenantPersonStatWrapper.TenantPersonStatSum(baseMapper.sumByNow(query.getTenantId()),dtos);

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/PaymentDivMemberRecordWrapper.java

@@ -67,10 +67,10 @@ public class PaymentDivMemberRecordWrapper {
         @ApiModelProperty("关键字匹配")
 		private String keyword;
 
-        @ApiModelProperty("支付时间")
+        @ApiModelProperty("支付时（年月日 时分秒）")
 		private String startTime;
 
-        @ApiModelProperty("支付时间")
+        @ApiModelProperty("支付时间（年月日 时分秒）")
 		private String endTime;
 
         @ApiModelProperty("订单类型")

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/TenantPersonStatWrapper.java

@@ -39,16 +39,6 @@ public class TenantPersonStatWrapper {
 
         @ApiModelProperty("时间节点")
         private String date;
-
-        public TenantPersonStatDto(String date) {
-            this.date = date;
-        }
-
-        public TenantPersonStatDto(Integer studentNum, Integer teacherNum, String date) {
-            this.studentNum = studentNum;
-            this.teacherNum = teacherNum;
-            this.date = date;
-        }
     }
 
 	@Data

cooleshow-user/user-biz/src/main/resources/config/mybatis/PaymentDivMemberRecordMapper.xml

@@ -87,8 +87,8 @@
         from payment_div_member_record pdmr
         left join user_order uo ON uo.order_no_ = pdmr.order_no_
         where pdmr.status_ = 'SUCCESS' AND pdmr.tenant_id_ = #{query.tenantId}
-        <if test="param.startTime != null and param.startTime != ''">
-            AND uo.pay_time_ BETWEEN #{param.startTime} AND #{param.endTime}
+        <if test="query.startTime != null and query.startTime != ''">
+            AND uo.pay_time_ BETWEEN #{query.startTime} AND #{query.endTime}
         </if>
         group by uo.order_type_
     </select>
@@ -98,8 +98,8 @@
         from user_order uo
         where uo.status_ = 'SUCCESS' AND uo.order_type_ = 'TENANT_ALBUM'
         AND uo.tenant_id_ = #{query.tenantId}
-        <if test="param.startTime != null and param.startTime != ''">
-            AND uo.pay_time_ BETWEEN #{param.startTime} AND #{param.endTime}
+        <if test="query.startTime != null and query.startTime != ''">
+            AND uo.pay_time_ BETWEEN #{query.startTime} AND #{query.endTime}
         </if>
         group by uo.order_type_
     </select>

cooleshow-user/user-biz/src/main/resources/config/mybatis/TenantPersonStatMapper.xml

@@ -19,14 +19,18 @@
         left join teacher t ON t.tenant_id_ = ti.id_ AND t.lock_flag_ = 0
         group by ti.id_
     </select>
-    <select id="indexSum"
-            resultType="com.yonge.cooleshow.biz.dal.wrapper.TenantPersonStatWrapper$TenantPersonStatDto">
+    <resultMap id="TenantPersonStatDto" type="com.yonge.cooleshow.biz.dal.wrapper.TenantPersonStatWrapper$TenantPersonStatDto">
+        <result property="studentNum" column="studentNum"/>
+        <result property="teacherNum" column="teacherNum"/>
+        <result property="date" column="date"/>
+    </resultMap>
+    <select id="indexSum" resultMap="TenantPersonStatDto">
         SELECT DATE_FORMAT(day_,#{query.format}) date,SUM(student_num_) studentNum,SUM(teacher_num_) teacherNum FROM tenant_person_stat
         WHERE tenant_id_ = #{query.tenantId} AND day_ BETWEEN #{query.startTime} AND #{query.endTime}
         GROUP BY ${query.groupBy}
     </select>
     <select id="sumByNow" resultType="com.yonge.cooleshow.biz.dal.wrapper.TenantPersonStatWrapper$TenantPersonStat">
-        select COUNT(s.user_id_) studentNum,COUNT(t.user_id_) teacherNum from tenant_info ti
+        select COUNT(distinct s.user_id_) studentNum,COUNT(distinct t.user_id_) teacherNum from tenant_info ti
         left join student s ON s.tenant_id_ = ti.id_ AND s.lock_flag_ = 0
         left join teacher t ON t.tenant_id_ = ti.id_ AND t.lock_flag_ = 0
         where ti.id_ = #{tenantId}