Merge branch 'zx_2022-11-22' of http://git.dayaedu.com/yonge/mec into master_saas

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentCourseConsumerServiceImpl.java

@@ -94,7 +94,7 @@ public class StudentCourseConsumerServiceImpl implements StudentCourseConsumerSe
                 consumerDto.setCourseConsumerRate(consumerDto.getCourseSum().divide(courseConsumerNum,2,BigDecimal.ROUND_DOWN).multiply(bigDecimal));
             }
             if(consumerDto.getNormalNum().compareTo(BigDecimal.ZERO) != 0){
-                consumerDto.setStandRate(consumerDto.getNum6().divide(consumerDto.getNormalNum(),2,BigDecimal.ROUND_DOWN));
+                consumerDto.setStandRate(consumerDto.getNum6().divide(consumerDto.getNormalNum(),2,BigDecimal.ROUND_DOWN).multiply(bigDecimal));
             }
             consumerDto.setCourseConsumerNum(courseConsumerNum);
         }

mec-biz/src/main/resources/config/mybatis/StudentStatisticsMapper.xml

@@ -577,7 +577,7 @@
 		from student_statistics ss
 		left join (select cssp.user_id_,COUNT(distinct cssp.course_schedule_id_) course_num_ from course_schedule cs
 		left join course_schedule_student_payment cssp ON cssp.course_schedule_id_ = cs.id_
-		where DATE_FORMAT(cs.class_date_,'%Y-%m') BETWEEN #{queryInfo.startDate} AND #{queryInfo.endDate} AND cs.type_ = 'VIP'
+		where DATE_FORMAT(cs.class_date_,'%Y-%m-%d') BETWEEN #{queryInfo.startDate} AND #{queryInfo.endDate} AND cs.type_ = 'VIP'
 		<include refid="com.ym.mec.biz.dal.dao.CourseScheduleDao.courseIgnore"/>
 		group by cssp.user_id_) cs ON cs.user_id_ = ss.user_id_
 		left join sys_user su ON su.id_ = ss.user_id_