Merge remote-tracking branch 'origin/master'

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

@@ -135,7 +135,7 @@ public interface IndexBaseMonthDataDao extends BaseDAO<Long, IndexBaseMonthData>
      * @param organIdsStr
      * @return
      */
-    List<Long> queryTeacherLeave(@Param("organIdsStr") String organIdsStr);
+    List<Long> queryTeacherLeave(@Param("organIdsStr") String organIdsStr, @Param("startTime") String startTime);
 
     /**
      * 获取预计课酬偏低的老师编号

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

@@ -399,7 +399,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 			List<Long> noAttendance = indexBaseMonthDataDao.getNoAttendance(organIdsStr,firstDayOfMonth,startTime);
 			threeChild.add(new IndexErrInfoDto(IndexErrorType.TEACHER_NOT_A_CLASS, IndexErrorType.TEACHER_NOT_A_CLASS.getMsg(), noAttendance.size(), noAttendance));
 
-			List<Long> teacherLeave = indexBaseMonthDataDao.queryTeacherLeave(organIdsStr);
+			List<Long> teacherLeave = indexBaseMonthDataDao.queryTeacherLeave(organIdsStr,startTime);
 			threeChild.add(new IndexErrInfoDto(IndexErrorType.TEACHER_LEAVE, IndexErrorType.TEACHER_LEAVE.getMsg(),teacherLeave.size(), teacherLeave));
 
 			String monthStr = DateUtil.format(date, DateUtil.ISO_YEAR_MONTH_FORMAT);
@@ -518,7 +518,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 			}
 		}
 		if(!flag3){
-			List<Long> teacherLeave = indexBaseMonthDataDao.queryTeacherLeave(organIdsStr);
+			List<Long> teacherLeave = indexBaseMonthDataDao.queryTeacherLeave(organIdsStr,startTime);
 			if(teacherLeave.size() > 0){
 				flag3 = true;
 			}

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

@@ -549,7 +549,7 @@
 			LEFT JOIN music_group mg ON mgq.music_group_id_=mg.id_
 		WHERE mg.status_='PROGRESS'
 		  AND mgq.status_='PROCESSING'
-		<if test="organIds!=null and organIds.size()>0">
+		<if test="organIds!=null and organIds.size() > 0">
 			AND mg.organ_id_ IN
 			<foreach collection="organIds" item="organId" open="(" close=")" separator=",">
 				#{organId}
@@ -610,7 +610,7 @@
 	<select id="queryTeacherLeave" resultType="java.lang.Long">
 		SELECT DISTINCT tlr.id_ FROM teacher_leave_record tlr
 		LEFT JOIN teacher t ON t.id_ = tlr.user_id_
-		WHERE tlr.status_ = 'ING'
+		WHERE tlr.status_ = 'ING' AND DATE_FORMAT( tlr.create_time_, '%Y-%m-%d' ) >= #{startTime}
 		<if test="organIdsStr != null and organIdsStr != ''">
 			AND FIND_IN_SET(t.organ_id_,#{organIdsStr})
 		</if>
@@ -618,7 +618,9 @@
 	<select id="queryLowTeacherSalary" resultType="java.lang.Long">
 		SELECT DISTINCT tcs.user_id_ FROM teacher_course_statistics tcs
 		LEFT JOIN teacher t ON t.id_ = tcs.user_id_
-		WHERE t.job_nature_ = 'FULL_TIME' AND t.demission_date_ IS NULL AND DATE_FORMAT(tcs.month_,'%Y-%m') = #{monthStr} AND tcs.low_salary = 1
+		LEFT JOIN sys_user su ON su.id_ = tcs.user_id_
+		WHERE su.lock_flag_ = 0 AND su.del_flag_ = 0 AND t.job_nature_ = 'FULL_TIME' AND t.demission_date_ IS NULL
+		AND DATE_FORMAT(tcs.month_,'%Y-%m') = #{monthStr} AND tcs.low_salary = 1
 		<if test="organIdsStr != null and organIdsStr != ''">
 			AND FIND_IN_SET(tcs.organ_id_,#{organIdsStr})
 		</if>

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

@@ -98,8 +98,9 @@
     <select id="queryPage" resultMap="TeacherCourseStatistics" parameterType="map">
         SELECT tcs.*,u.real_name_,u.phone_,o.name_ organ_name_,DATE_FORMAT(tcs.month_,'%Y年%m月') month_str_,
         s.id_ subject_id,s.name_ subject_name FROM teacher_course_statistics tcs
-        left join sys_user u on tcs.user_id_ = u.id_
-        left join organization o on tcs.organ_id_ = o.id_
+        LEFT JOIN sys_user u ON tcs.user_id_ = u.id_
+        LEFT JOIN teacher t ON t.id_ = tcs.user_id_
+        LEFT JOIN organization o ON tcs.organ_id_ = o.id_
         LEFT JOIN subject s ON FIND_IN_SET(s.id_,tcs.subject_id_list_)
         <include refid="queryParams"/>
         <include refid="global.limit"/>
@@ -107,12 +108,15 @@
 
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int" parameterType="map">
-        SELECT COUNT(*) FROM teacher_course_statistics tcs
+        SELECT COUNT(tcs.id_) FROM teacher_course_statistics tcs
+        LEFT JOIN sys_user u ON tcs.user_id_ = u.id_
+        LEFT JOIN teacher t ON t.id_ = tcs.user_id_
         <include refid="queryParams"/>
     </select>
 
     <sql id="queryParams">
         <where>
+            u.lock_flag_ = 0 AND u.del_flag_ = 0 AND t.job_nature_ = 'FULL_TIME' AND t.demission_date_ IS NULL
             <if test="organId != null">
                 AND FIND_IN_SET(tcs.organ_id_,#{organId})
             </if>