Merge branch 'zx_saas_shortUrl' of http://git.dayaedu.com/yonge/mec into test

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;
 
@@ -111,6 +117,9 @@ public class CourseHomeworkWrapper {
 
         @ApiModelProperty(value = "学生姓名")
         private String username;
+
+        @ApiModelProperty(value = "学生头像")
+        private String avatar;
     }
 
 

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

@@ -771,7 +771,8 @@
     <select id="queryStudentLeave"
             resultType="com.ym.mec.biz.dal.dto.CourseHomeworkWrapper$StudentLeaveResult">
         select cs.class_date_ classDate,cs.start_class_time_ startClassTime,cs.end_class_time_ endClassTime,sa.leave_time_ leaveTime,
-               cg.name_ classGroupName,cs.type_ courseScheduleType,sa.remark_ remark,su.username_ username from student_attendance sa
+               cg.name_ classGroupName,cs.type_ courseScheduleType,sa.remark_ remark,su.username_ username,su.avatar_ avatar
+        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_
@@ -781,12 +782,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>