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

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

@@ -965,9 +965,9 @@ public class StudentServeServiceImpl implements StudentServeService {
         LocalDate sunDayDate = localDate.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.SUNDAY.getValue());
 
         Set<Integer> hss = studentCourseHomeworkDao.checkStudentHaveHomeworkInDateRange(monDayDate.toString(), sunDayDate.toString(), studentIds);
-        Set<Integer> ess = extracurricularExercisesReplyDao.checkStudentHaveExercisesInDateRange(monDayDate.toString(), sunDayDate.toString(), studentIds);
+//        Set<Integer> ess = extracurricularExercisesReplyDao.checkStudentHaveExercisesInDateRange(monDayDate.toString(), sunDayDate.toString(), studentIds);
         for (Integer studentId : studentIds) {
-            if(!hss.contains(studentId)&&!ess.contains(studentId)){
+            if(!hss.contains(studentId)){
                 result.put("isAssignHomework", 0);
                 return result;
             }

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

@@ -550,7 +550,7 @@
                 </foreach>
             </if>
             <if test="currentGrade != null">
-                AND sr.current_grade_ LIKE CONCAT('%',#{currentGrade},'%')
+                AND stu.current_grade_num_ = #{currentGrade}
             </if>
             <if test="createYear != null">
                 AND DATE_FORMAT(sr.create_time_,'%Y') =  #{createYear}

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

@@ -438,7 +438,7 @@
                 AND (su.username_ LIKE CONCAT('%',#{name},'%') OR sr.parents_phone_ LIKE CONCAT('%',#{name},'%'))
             </if>
             <if test="currentGrade != null">
-                AND sr.current_grade_ LIKE CONCAT('%',#{currentGrade},'%')
+                AND st.current_grade_num_ = #{currentGrade}
             </if>
             <if test="createYear != null">
                 AND DATE_FORMAT(sr.create_time_,'%Y') = #{createYear}
@@ -522,6 +522,7 @@
         SELECT COUNT(sr.id_)
         FROM student_registration sr
         LEFT JOIN sys_user su ON sr.user_id_ = su.id_
+        LEFT JOIN student st ON st.user_id_ = su.id_
         LEFT JOIN (
         SELECT v.student_id_, COUNT(*) num
         FROM student_visit v