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

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

@@ -1748,7 +1748,7 @@
 		SELECT COUNT(DISTINCT c.user_id_) FROM (
 		SELECT sa.user_id_ FROM student_attendance sa
 		LEFT JOIN course_schedule cs ON cs.id_ = sa.course_schedule_id_
-		WHERE DATE_FORMAT(cs.class_date_,'%Y-%m') >= #{format} AND sa.status_ = 'LEAVE' AND cs.pre_course_flag_ = 0 and cs.tenant_id_ = #{tenantId}
+		WHERE DATE_FORMAT(cs.class_date_,'%Y-%m') = #{format} AND sa.status_ = 'LEAVE' AND cs.pre_course_flag_ = 0 and cs.tenant_id_ = #{tenantId}
 		<if test="organIdList != null and organIdList.size > 0">
 			AND cs.organ_id_ IN
 			<foreach collection="organIdList" open="(" close=")" item="item" separator=",">
@@ -1791,7 +1791,7 @@
 		SELECT sa.user_id_ FROM student_attendance sa
 		LEFT JOIN course_schedule cs ON cs.id_ = sa.course_schedule_id_
 		LEFT JOIN sys_user su ON su.id_ = sa.user_id_
-		WHERE DATE_FORMAT(cs.class_date_,'%Y-%m') >= #{currentMonth} AND sa.status_ = 'LEAVE' AND cs.pre_course_flag_ = 0 and cs.tenant_id_ = #{tenantId}
+		WHERE DATE_FORMAT(cs.class_date_,'%Y-%m') = #{currentMonth} AND sa.status_ = 'LEAVE' AND cs.pre_course_flag_ = 0 and cs.tenant_id_ = #{tenantId}
 		<if test="organIds != null">
 			AND FIND_IN_SET(cs.organ_id_,#{organIds})
 		</if>
@@ -1821,12 +1821,12 @@
 	<select id="queryStudentErrorLeave" resultMap="StudentErrorLeaveDto">
 		SELECT organ_id_,organ_name_,user_id_,username_,phone_,current_num_,class_date_,course_num_
 		FROM (SELECT cs.organ_id_,o.name_ organ_name_,sa.user_id_,su.username_,su.phone_,
-		COUNT(sa.id_) current_num_,cs.class_date_,COUNT(DISTINCT sa.course_schedule_id_) course_num_
+		COUNT(distinct DATE_FORMAT(cs.class_date_,'%Y-%m-%d')) current_num_,cs.class_date_,COUNT(DISTINCT sa.course_schedule_id_) course_num_
 		FROM student_attendance sa
 		LEFT JOIN course_schedule cs ON cs.id_ = sa.course_schedule_id_
 		LEFT JOIN organization o ON o.id_ = cs.organ_id_
 		LEFT JOIN sys_user su ON su.id_ = sa.user_id_
-		WHERE DATE_FORMAT(cs.class_date_,'%Y-%m') >= #{currentMonth} AND sa.status_ = 'LEAVE' AND cs.pre_course_flag_ = 0 and cs.tenant_id_ = #{tenantId}
+		WHERE DATE_FORMAT(cs.class_date_,'%Y-%m') = #{currentMonth} AND sa.status_ = 'LEAVE' AND cs.pre_course_flag_ = 0 and cs.tenant_id_ = #{tenantId}
 		<if test="organIds != null">
 			AND FIND_IN_SET(cs.organ_id_,#{organIds})
 		</if>

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

@@ -642,6 +642,7 @@
 			AND (su.username_ LIKE CONCAT('%',#{search},'%') OR su.phone_ LIKE CONCAT('%',#{search},'%') OR su.id_ = #{search})
 		</if>
 		group by ss.user_id_ order by su.organ_id_
+		<include refid="global.limit"/>
 	</select>
 	<select id="countCourseConsumerDetail" resultType="java.lang.Integer">
 		select COUNT(DISTINCT ss.user_id_)
@@ -674,6 +675,7 @@
 			AND (su.username_ LIKE CONCAT('%',#{search},'%') OR su.phone_ LIKE CONCAT('%',#{search},'%') OR su.id_ = #{search})
 		</if>
 		ORDER BY su.organ_id_
+		<include refid="global.limit"/>
 	</select>
 	<select id="countPreCourseConsumerDetail" resultType="java.lang.Integer">
 		select COUNT(DISTINCT ss.user_id_)

mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -2889,9 +2889,9 @@ public class ExportController extends BaseController {
         }
         OutputStream outputStream = response.getOutputStream();
         try {
-            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部", "学生编号",
-                    "学生姓名", "手机号", "近两个月请假次数", "本月请假天数"}, new String[]{
-                    "organName", "userId", "studentName", "phone", "totalNum", "currentNum"}, rows);
+            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部", "乐团", "乐团主管", "学生编号",
+                    "学生姓名", "手机号", "近两个月请假天数", "本月请假天数", "课时数"}, new String[]{
+                    "organName", "musicGroupName", "eduName", "userId", "studentName", "phone", "totalNum", "currentNum", "courseNum"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attac:wq" +
                     "hment;filename=studentErrorLeaveList-" + DateUtil.getDate(new Date()) + ".xls");