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

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

@@ -404,6 +404,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 			params.put("organIds", organIds);
 			params.put("monday",monDayDate.toString());
 			params.put("sunday",sunDayDate.toString());
+			params.put("jobNature", JobNatureEnum.FULL_TIME);
 			params.put("unDone",1);
 			int serveErrTeacherNum = studentExtracurricularExercisesSituationDao.countTeacherServeInfo(params);
 			fourChild.add(new IndexErrInfoDto(IndexErrorType.TEACHER_SERVE_ERROR, IndexErrorType.TEACHER_SERVE_ERROR.getMsg(), serveErrTeacherNum, null));

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

@@ -276,7 +276,9 @@
 			</choose>
 		FROM student_extracurricular_exercises_situation_ sees
 		LEFT JOIN sys_user su ON sees.student_id_=su.id_
+		LEFT JOIN teacher tea ON sees.teacher_id_=tea.id_
 		WHERE su.del_flag_=0
+		  	AND tea.job_nature_='FULL_TIME'
 			AND su.organ_id_ IS NOT NULL
 			AND DATE_FORMAT(sees.monday_, '%Y-%m-%d')&lt;=#{dayStr}
 			AND DATE_FORMAT(sees.sunday_, '%Y-%m-%d')&gt;=#{dayStr}

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

@@ -522,7 +522,7 @@
 				AND EXISTS (SELECT id_ FROM teacher_remind WHERE operator_id_=#{operatorId} AND teacher_id_=sees.teacher_id_ AND monday_ = sees.monday_ AND type_='SERVICE')
 			</if>
 			<if test="jobNature!=null">
-				AND tea.job_nature_=#{jobNature}
+				AND tea.job_nature_=#{jobNature,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 			</if>
 		</where>
 	</sql>