bug修改

mec-biz/src/main/java/com/ym/mec/biz/dal/school/dto/TeacherAttendanceSumDto.java

@@ -26,8 +26,8 @@ public class TeacherAttendanceSumDto {
     private TeacherAttendanceQueryInfo.TeacherAttendanceEnum teacherAttendanceStatus = TeacherAttendanceQueryInfo.TeacherAttendanceEnum.NO_COURSE;
 
     @ApiModelProperty(value = "本学期异常考勤课程数")
-    private Integer errCourseNum;
+    private Integer errCourseNum = 0;
 
     @ApiModelProperty(value = "本学期总课程数")
-    private Integer totalCourseNum;
+    private Integer totalCourseNum = 0;
 }

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

@@ -118,6 +118,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     @Autowired
     private CourseScheduleStudentPaymentService courseScheduleStudentPaymentService;
     @Autowired
+    private CourseScheduleModifyLogService courseScheduleModifyLogService;
+    @Autowired
     private StudentApplyRefundsDao studentApplyRefundsDao;
     @Autowired
     private RedisCache<String, Object> redisCache;
@@ -2497,8 +2499,6 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             }
             imUserFriendService.refreshClassImUserFriend(classGroupId);
             // 通知学校端
-
-
             for (ClassGroup4MixDto classGroup4MixDto : classGroup4MixDtos) {
                 if (CollectionUtils.isEmpty(classGroup4MixDto.getClassGroupTeacherMapperList())) {
                     continue;
@@ -2738,12 +2738,11 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             //学生结算表
             courseScheduleStudentPaymentService.createForMusicGroup(musicGroupId, courseScheduleList, studentIds);
         }
+        //学校端推送
+        courseScheduleModifyLogService.pushSchoolCourseCreate(courseScheduleList.get(0),musicGroup);
         if (musicGroup.getStatus() == PROGRESS) {
             imUserFriendService.refreshClassImUserFriend(classGroupId);
         }
-
-
-
         return BaseController.succeed(classGroup);
     }
 

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

@@ -1216,33 +1216,39 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 				List<TeacherAttendanceWrapper.CourseTeacherAttendance> attendances = attendanceMap.get(dto.getTeacherId());
 				if(CollectionUtils.isNotEmpty(attendances)){
 					dto.setTeacherAttendanceStatus(TeacherAttendanceQueryInfo.TeacherAttendanceEnum.NORMAL);
+					int errCourseNum = 0;
 					att:for (TeacherAttendanceWrapper.CourseTeacherAttendance attendance : attendances) {
 						if(attendance.getCourseStatus() == CourseStatusEnum.NOT_START){
 							continue att;
 						}
 						if(attendance.getSignInStatus() == 0 || attendance.getSignOutStatus() == 0){
 							dto.setTeacherAttendanceStatus(TeacherAttendanceQueryInfo.TeacherAttendanceEnum.ERR);
-							break att;
+							errCourseNum++;
+							continue att;
 						}
 						if(attendance.getTeachMode() == TeachModeEnum.OFFLINE){
 							if(StringUtils.isEmpty(attendance.getSignInLongitudeLatitude()) || StringUtils.isEmpty(attendance.getSignOutLongitudeLatitude())){
+								errCourseNum++;
+							}else {
 								//计算考勤范围
 								School school = idSchoolMap.get(attendance.getSchoolId());
 								if(school != null){
 									Boolean signRange = courseScheduleTeacherSalaryService.getSignRange(school.getLongitudeLatitude(), attendance.getSignInLongitudeLatitude(), attendanceRange);
 									if(!signRange){
 										dto.setTeacherAttendanceStatus(TeacherAttendanceQueryInfo.TeacherAttendanceEnum.ERR);
-										break att;
+										errCourseNum++;
+										continue att;
 									}
 									signRange = courseScheduleTeacherSalaryService.getSignRange(school.getLongitudeLatitude(), attendance.getSignOutLongitudeLatitude(), attendanceRange);
 									if(!signRange){
 										dto.setTeacherAttendanceStatus(TeacherAttendanceQueryInfo.TeacherAttendanceEnum.ERR);
-										break att;
+										errCourseNum++;
 									}
 								}
 							}
 						}
 					}
+					dto.setErrCourseNum(errCourseNum);
 				}
 			}
 			if(queryInfo.getTeacherAttendanceStatus() != null){

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

@@ -628,11 +628,9 @@
     </select>
     <select id="queryTeacherAttendance" resultType="com.ym.mec.biz.dal.school.dto.TeacherAttendanceSumDto">
         select cg.type_ classGroupType,cs.actual_teacher_id_ teacherId,COUNT(distinct cs.id_) totalCourseNum,
-               COUNT(CASE WHEN ta.sign_in_status_ = 1 and ta.sign_in_status_ = 1 THEN NULL ELSE 1 END) errCourseNum,
                cs.class_group_id_ classGroupId,su.avatar_ teacherAvatar,su.real_name_ teacherName
         from course_schedule cs
         left join class_group cg ON cg.id_ = cs.class_group_id_
-        left join teacher_attendance ta ON ta.course_schedule_id_ = cs.id_ AND ta.teacher_id_ = cs.actual_teacher_id_
         left join sys_user su ON su.id_ = cs.actual_teacher_id_
         <include refid="queryTeacherAttendanceSql"/>
         group by cs.actual_teacher_id_