1、待激活云教练导出文件新增【分部】【获得资格时间】字段

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CourseHomeworkWrapper.java

@@ -75,6 +75,12 @@ public class CourseHomeworkWrapper {
         @ApiModelProperty(value = "班级id")
         private Integer classGroupId;
 
+        @ApiModelProperty(value = "课程类型")
+        private String courseScheduleType;
+
+        @ApiModelProperty(value = "班级类型")
+        private String classGroupType;
+
         @ApiModelProperty(value = "开始时间(年月日)",required = true)
         private String startTime;
 

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

@@ -781,12 +781,19 @@
     <select id="countStudentLeave" resultType="java.lang.Integer">
         select COUNT(sa.id_) from student_attendance sa
          left join course_schedule cs ON cs.id_ = sa.course_schedule_id_
+         left join class_group cg ON cg.id_ = cs.class_group_id_
          left join sys_user su ON su.id_ = sa.user_id_
         <include refid="queryStudentLeaveCondition"/>
     </select>
     <sql id="queryStudentLeaveCondition">
         <where>
             sa.status_ = 'LEAVE'
+            <if test="classGroupType != null and classGroupType != ''">
+                AND cg.type_ = #{classGroupType}
+            </if>
+            <if test="courseScheduleType != null and courseScheduleType != ''">
+                AND cs.type_ = #{courseScheduleType}
+            </if>
             <if test="classGroupId != null">
                 AND sa.class_group_id_ = #{classGroupId}
             </if>