feat:教师端课酬、服务指标异常

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

@@ -1642,9 +1642,9 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
         }else{
             List<TeacherSalaryDeductReasonDto> deductReasons = new ArrayList<>();
 
-            BigDecimal subsidy = school.getSubsidy();
-            if (Objects.isNull(subsidy)) {
-                subsidy = new BigDecimal(0);
+            BigDecimal subsidy = new BigDecimal(0);
+            if (Objects.nonNull(school)&&Objects.nonNull(school.getSubsidy())) {
+                subsidy = school.getSubsidy();
             }
             teacherSalary = teacherSalary.add(subsidy);
 

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

@@ -467,6 +467,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 			params.put("sunday",sunDayDate.toString());
 			params.put("jobNature", JobNatureEnum.FULL_TIME);
 			params.put("unDone",1);
+			params.put("reminded",0);
 			int serveErrTeacherNum = studentExtracurricularExercisesSituationDao.countTeacherServeInfo(params);
 			fourChild.add(new IndexErrInfoDto(IndexErrorType.TEACHER_SERVE_ERROR, IndexErrorType.TEACHER_SERVE_ERROR.getMsg(), serveErrTeacherNum, null));
 
@@ -609,6 +610,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 			params.put("sunday",sunDayDate.toString());
 			params.put("jobNature", JobNatureEnum.FULL_TIME);
 			params.put("unDone",1);
+			params.put("reminded",0);
 			List<Map<Integer, Integer>> teacherServeErrorMapList = indexBaseMonthDataDao.countOrganTeacherServeInfo(params);
 			teacherServeErrorMap = MapUtil.mapListToMap(teacherServeErrorMapList, Integer.class, Integer.class);
 		}

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

@@ -509,9 +509,9 @@
 			<if test="monday!=null and monday!='' and sunday!=null and sunday!=''">
 				AND sees.monday_ BETWEEN #{monday} AND #{sunday}
 			</if>
-			<if test="unDone!=null and unDone==1">
-				AND tm.teacher_id_ IS NULL
-			</if>
+<!--			<if test="unDone!=null and unDone==1">-->
+<!--				AND tm.teacher_id_ IS NULL-->
+<!--			</if>-->
 			<if test="teacherId!=null">
 				AND sees.teacher_id_ = #{teacherId}
 			</if>