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

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

@@ -495,6 +495,12 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 			userId = sysUser.getId();
 		}
 		if(!flag3){
+			int courseTimeError = indexBaseMonthDataDao.getCourseTimeError(organIds);
+			if(courseTimeError > 0){
+				flag3 = true;
+			}
+		}
+		if(!flag3){
 			int inspectionItem = indexBaseMonthDataDao.queryInspectionItem(organIdsStr,startTime,userId);
 			if(inspectionItem > 0){
 				flag3 = true;
@@ -516,12 +522,6 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 
 		boolean flag4 = false;
 		if(!flag4){
-			int courseTimeError = indexBaseMonthDataDao.getCourseTimeError(organIds);
-			if(courseTimeError > 0){
-				flag4 = true;
-			}
-		}
-		if(!flag4){
 			int attendanceError = indexBaseMonthDataDao.getAttendanceError(organIds,startTime);
 			if(attendanceError > 0){
 				flag4 = true;

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

@@ -281,7 +281,7 @@
     </sql>
     <sql id="queryTeacherAttendancesCondition">
         <where>
-            cs.del_flag_ = 0
+            cs.del_flag_ = 0 AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_)
             <if test="search != null and search != ''">
                 AND (su.id_ = #{search} OR su.real_name_ LIKE CONCAT('%',#{search},'%') OR cs.id_ = #{search} OR cs.name_ LIKE CONCAT('%',#{search},'%'))
             </if>