Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/TeacherAttendanceDao.java

@@ -115,4 +115,13 @@ public interface TeacherAttendanceDao extends BaseDAO<Long, TeacherAttendance> {
 	 * @return java.util.List<java.util.Map<java.lang.Integer,java.lang.Integer>>
 	 */
 	List<Map<Integer,Integer>> findCourseTimeByClassGroup(Integer classGroupId);
+
+    /**
+     * @describe 获取指定课程的课次
+     * @author Joburgess
+     * @date 2019/11/22
+     * @param courseScheduleIds: 课程编号列表
+     * @return java.util.List<java.util.Map<java.lang.Integer,java.lang.Integer>>
+     */
+    List<Map<Integer,Integer>> findCourseTimeByCourseSchedules(@Param("courseScheduleIds") List<Integer> courseScheduleIds);
 }

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

@@ -52,7 +52,11 @@ public class CourseHomeworkServiceImpl extends BaseServiceImpl<Long, CourseHomew
 		int count = courseHomeworkDao.countByClassGroupAndTeacher(params);
 		if (count > 0) {
 			dataList = courseHomeworkDao.findByClassGroupAndTeacher(params);
-			List<Map<Integer, Integer>> courseTimeByClassGroup = teacherAttendanceDao.findCourseTimeByClassGroup(queryInfo.getClassGroupId().intValue());
+			List<Integer> courseScheduleIds=dataList.stream()
+					.map(TeacherHomeworkListDto::getCourseScheduleId)
+					.distinct()
+					.collect(Collectors.toList());
+			List<Map<Integer, Integer>> courseTimeByClassGroup = teacherAttendanceDao.findCourseTimeByCourseSchedules(courseScheduleIds);
 			Map<Integer, Integer> map = MapUtil.convertIntegerMap(courseTimeByClassGroup);
 			dataList.forEach(teacherHomeworkListDto -> {
 				teacherHomeworkListDto.setCurrentClassTimes(map.get(teacherHomeworkListDto.getCourseScheduleId().longValue()));

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

@@ -283,6 +283,18 @@
         WHERE
             class_group_id_ = #{classGroupId}
     </select>
+    <select id="findCourseTimeByCourseSchedules" resultType="java.util.Map">
+        SELECT
+            course_schedule_id_ AS 'key',
+            current_class_times_ AS 'value'
+        FROM
+            `teacher_attendance`
+        WHERE
+            course_schedule_id_ IN
+            <foreach collection="courseScheduleIds" item="courseScheduleId" open="(" close=")" separator=",">
+                #{courseScheduleId}
+            </foreach>
+    </select>
 
     <update id="updateViPSignOutStatus" parameterType="string">
     	update teacher_attendance set sign_out_status_ = 1,sign_out_time_= now()

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

@@ -155,7 +155,7 @@
     <sql id="vipGroupQueryCondition">
         <where>
             1=1
-            AND vg.audit_status_!='REJECT'
+            AND vg.audit_status_='PASS'
             <if test="search!=null and search!=''">
                 AND (vg.name_ LIKE CONCAT('%',#{search},'%') OR vg.id_=#{search})
             </if>