|
@@ -8,7 +8,10 @@ import com.ym.mec.biz.dal.entity.*;
|
|
|
import com.ym.mec.biz.dal.enums.*;
|
|
|
import com.ym.mec.biz.dal.page.CourseHomeworkQueryInfo;
|
|
|
import com.ym.mec.biz.dal.page.StudentAttendanceQueryInfo;
|
|
|
-import com.ym.mec.biz.service.*;
|
|
|
+import com.ym.mec.biz.service.StudentAttendanceService;
|
|
|
+import com.ym.mec.biz.service.SysConfigService;
|
|
|
+import com.ym.mec.biz.service.SysMessageService;
|
|
|
+import com.ym.mec.common.config.RequestAttributeHystrixConcurrencyStrategy;
|
|
|
import com.ym.mec.common.dal.BaseDAO;
|
|
|
import com.ym.mec.common.exception.BizException;
|
|
|
import com.ym.mec.common.page.PageInfo;
|
|
@@ -18,6 +21,8 @@ import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
|
|
|
import com.ym.mec.util.collection.MapUtil;
|
|
|
import com.ym.mec.util.date.DateUtil;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
+import org.slf4j.Logger;
|
|
|
+import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
@@ -44,8 +49,6 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
|
|
|
@Autowired
|
|
|
private SysUserFeignService sysUserFeignService;
|
|
|
@Autowired
|
|
|
- private SubjectDao subjectDao;
|
|
|
- @Autowired
|
|
|
private MusicGroupStudentFeeDao musicGroupStudentFeeDao;
|
|
|
@Autowired
|
|
|
private MusicGroupQuitDao musicGroupQuitDao;
|
|
@@ -58,14 +61,13 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
|
|
|
@Autowired
|
|
|
private SysConfigService sysConfigService;
|
|
|
@Autowired
|
|
|
- private CourseScheduleService courseScheduleService;
|
|
|
- @Autowired
|
|
|
private TeacherAttendanceDao teacherAttendanceDao;
|
|
|
|
|
|
@Override
|
|
|
public BaseDAO<Long, StudentAttendance> getDAO() {
|
|
|
return studentAttendanceDao;
|
|
|
}
|
|
|
+ private static final Logger log = LoggerFactory.getLogger(StudentAttendanceServiceImpl.class);
|
|
|
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@@ -583,7 +585,6 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- @Transactional(rollbackFor = Exception.class)
|
|
|
public void repairStudentAttendance(Integer month) {
|
|
|
//获取所有有老师考勤的课程记录,正常签退,当月线上课,有学员签到记录
|
|
|
List<CourseSchedule> courseScheduleList = courseScheduleDao.queryScheduleByAttendance(month);
|
|
@@ -594,6 +595,7 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
|
|
|
}
|
|
|
Date date = new Date();
|
|
|
for (CourseSchedule courseSchedule : courseScheduleList) {
|
|
|
+ log.info("课程编号: {}",courseSchedule.getId());
|
|
|
//只会修复签到的学员考勤
|
|
|
List<StudentAttendance> byCourseId = studentAttendanceDao.findByCourseId(courseSchedule.getId());
|
|
|
if(byCourseId == null || byCourseId.size() == 0){
|