Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/service/TeacherAttendanceService.java

@@ -159,7 +159,7 @@ public interface TeacherAttendanceService extends BaseService<Long, TeacherAtten
 	 * @param courseScheduleId
 	 * @param content
 	 */
-	void addComplaints(Long courseScheduleId, String content);
+	void addComplaints(Long courseScheduleId, String content,String url);
 
 	/**
 	 * 撤销考勤申述

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

@@ -667,22 +667,28 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public synchronized void addComplaints(Long courseScheduleId, String content) {
+	public synchronized void addComplaints(Long courseScheduleId, String content,String url) {
 		SysUser user = sysUserFeignService.queryUserInfo();
 		if(Objects.isNull(user)){
 			throw new BizException("请登录");
 		}
 		TeacherAttendance teacherAttendance = teacherAttendanceDao.findByTeacherAttendanceInfo(user.getId().longValue(), courseScheduleId);
-		if(teacherAttendance == null){
-			throw new BizException("考勤信息不存在");
-		}
-		if(teacherAttendance.getComplaintsStatus() != null && teacherAttendance.getComplaintsStatus() != REPEAL){
-            throw new BizException("请勿重复提交考勤申述");
-        }
+
 		CourseSchedule courseSchedule = courseScheduleDao.get(courseScheduleId);
 		if(courseSchedule == null){
 			throw new BizException("课程不存在");
 		}
+		if(teacherAttendance == null){
+			teacherAttendance = new TeacherAttendance();
+			teacherAttendance.setMusicGroupId(courseSchedule.getMusicGroupId());
+			teacherAttendance.setTeacherId(user.getId());
+			teacherAttendance.setClassGroupId(courseSchedule.getClassGroupId());
+			teacherAttendance.setGroupType(courseSchedule.getGroupType());
+			teacherAttendance.setCourseScheduleId(courseScheduleId);
+			teacherAttendanceDao.insert(teacherAttendance);
+		}else if(teacherAttendance.getComplaintsStatus() != null && teacherAttendance.getComplaintsStatus() != REPEAL){
+            throw new BizException("请勿重复提交考勤申述");
+        }
 		//如果课程时间在两天前
 		Date date = new Date();
         int i = DateUtil.daysBetween(courseSchedule.getClassDate(), DateUtil.stringToDate(DateUtil.format(date,DateUtil.DEFAULT_PATTERN),DateUtil.DEFAULT_PATTERN));
@@ -693,6 +699,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 		teacherAttendance.setComplaintsStatus(ComplaintsStatusEnum.WAIT);
 		teacherAttendance.setComplaintsContent(content);
 		teacherAttendance.setComplaintsTime(date);
+		teacherAttendance.setUrl(url);
 		teacherAttendanceDao.update(teacherAttendance);
 	}
 
@@ -737,10 +744,6 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void agreeTeacherAttendanceComplaints(Integer signInStatus, Integer signOutStatus, long teacherAttendanceId,String content) {
-		SysUser user = sysUserFeignService.queryUserInfo();
-		if(Objects.isNull(user)){
-			throw new BizException("请登录");
-		}
 		TeacherAttendance teacherAttendance = teacherAttendanceDao.get(teacherAttendanceId);
 		if(teacherAttendance == null){
 			throw new BizException("考勤信息不存在");
@@ -775,13 +778,16 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 				teacherAttendance.setSignOutStatus(YesOrNoEnum.YES);
 			}
 			teacherAttendance.setDisposeContent(content);
-			teacherAttendance.setOperator(user.getId());
+			SysUser user = sysUserFeignService.queryUserInfo();
+			if(user != null && user.getId() != null){
+				teacherAttendance.setOperator(user.getId());
+			}
 			teacherAttendance.setComplaintsStatus(ComplaintsStatusEnum.PASS);
 			teacherAttendance.setRemark(remark.toString());
 			teacherAttendanceDao.update(teacherAttendance);
 			String format = DateUtil.format(courseSchedule.getClassDate(), DateUtil.DEFAULT_PATTERN);
 			Map<Integer, String> receivers = new HashMap<>(1);
-			receivers.put(user.getId(),user.getId().toString());
+			receivers.put(teacherAttendance.getTeacherId(),teacherAttendance.getTeacherId().toString());
 			sysMessageService.batchSendMessage(MessageSender.JIGUANG, MessageTypeEnum.TEACHER_ATTENDANCE_COMPLAINTS_RESULT, receivers, null, 0, null, "TEACHER",
 					format,courseSchedule.getName(),"通过");
 		}else {
@@ -807,7 +813,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 			CourseSchedule courseSchedule = courseScheduleDao.get(teacherAttendance.getCourseScheduleId());
 			String format = DateUtil.format(courseSchedule.getClassDate(), DateUtil.DEFAULT_PATTERN);
 			Map<Integer, String> receivers = new HashMap<>(1);
-			receivers.put(user.getId(),user.getId().toString());
+			receivers.put(teacherAttendance.getTeacherId(),teacherAttendance.getTeacherId().toString());
 			sysMessageService.batchSendMessage(MessageSender.JIGUANG, MessageTypeEnum.TEACHER_ATTENDANCE_COMPLAINTS_RESULT, receivers, null, 0, null, "TEACHER",
 					format,courseSchedule.getName(),"拒绝");
 		}else {

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherAttendanceController.java

@@ -69,8 +69,8 @@ public class TeacherAttendanceController extends BaseController {
 
     @ApiOperation(value = "提交考勤申述")
     @PostMapping("/addComplaints")
-    public Object addComplaints(Long courseScheduleId,String content){
-        teacherAttendanceService.addComplaints(courseScheduleId,content);
+    public Object addComplaints(Long courseScheduleId,String content,String url){
+        teacherAttendanceService.addComplaints(courseScheduleId,content,url);
         return succeed();
     }