Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseScheduleComplaintsDao.java

@@ -68,4 +68,12 @@ public interface CourseScheduleComplaintsDao extends BaseDAO<Long, CourseSchedul
      * @param courseScheduleIds
      */
     void delByCourseScheduleIds(@Param("courseScheduleIds") List<Long> courseScheduleIds);
+
+    /**
+     * 获取课程用户的评价
+     *
+     * @param courseScheduleId
+     * @return
+     */
+    List<CourseScheduleComplaintsDto> findCourseIdComplaints(@Param("courseScheduleId") Long courseScheduleId);
 }

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

@@ -291,6 +291,9 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
         if (courseScheduleComplaint != null) {
             List<CourseScheduleComplaintsDto> courseScheduleComplaints = new ArrayList<>();
             courseScheduleComplaints.add(courseScheduleComplaint);
+            if (courseScheduleReview.getStudentId() == null) {
+                courseScheduleComplaints = courseScheduleComplaintsDao.findCourseIdComplaints(courseScheduleReview.getCourseScheduleId().longValue());
+            }
             reviewInfoDto.setCourseScheduleComplaints(courseScheduleComplaints);
         }
         return reviewInfoDto;

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

@@ -689,17 +689,25 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 			throw new BizException("考勤信息不存在");
 		}
 		if(teacherAttendance.getComplaintsStatus() == ComplaintsStatusEnum.WAIT){
-			if(signInStatus != null){
+			CourseSchedule courseSchedule = courseScheduleDao.get(teacherAttendance.getCourseScheduleId());
+			String classDate = DateUtil.format(courseSchedule.getClassDate(), DateUtil.DEFAULT_PATTERN);
+			if(signInStatus != null && teacherAttendance.getSignInStatus() != YesOrNoEnum.YES){
+				String startTime = DateUtil.format(courseSchedule.getStartClassTime(), DateUtil.EXPANDED_TIME_FORMAT);
+				Date date = DateUtil.stringToDate(classDate + ' ' + startTime, DateUtil.EXPANDED_DATE_TIME_FORMAT);
+				teacherAttendance.setSignInTime(DateUtil.addMinutes(date,1));
 				teacherAttendance.setSignInStatus(YesOrNoEnum.YES);
 			}
-			if(signOutStatus != null){
+			if(signOutStatus != null && teacherAttendance.getSignOutStatus() != YesOrNoEnum.YES){
+				String endTime = DateUtil.format(courseSchedule.getEndClassTime(), DateUtil.EXPANDED_TIME_FORMAT);
+				Date date = DateUtil.stringToDate(classDate + ' ' + endTime, DateUtil.EXPANDED_DATE_TIME_FORMAT);
+				teacherAttendance.setSignOutTime(date);
 				teacherAttendance.setSignOutStatus(YesOrNoEnum.YES);
 			}
 			teacherAttendance.setDisposeContent(content);
 			teacherAttendance.setOperator(user.getId());
 			teacherAttendance.setComplaintsStatus(ComplaintsStatusEnum.PASS);
+			teacherAttendance.setRemark("同意异常考勤申述");
 			teacherAttendanceDao.update(teacherAttendance);
-			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());

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

@@ -155,4 +155,9 @@
 			#{id}
 		</foreach>
 	</select>
+	<select id="findCourseIdComplaints" resultMap="CourseScheduleComplaintsDtoMap">
+		SELECT su.username_,csc.reason_,csc.score_,su.avatar_ FROM course_schedule_complaints csc
+		LEFT JOIN sys_user su on csc.user_id_ = su.id_ WHERE
+		course_schedule_id_=#{courseScheduleId}
+	</select>
 </mapper>

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

@@ -721,7 +721,6 @@
         WHERE (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
           AND cs.class_date_ = DATE_FORMAT(#{classDate}, '%Y%m%d')
           AND csts.user_id_ = #{teacherId}
-          AND cg.del_flag_ = 0
           AND CONCAT(cs.class_date_, ' ', cs.end_class_time_) < NOW()
         ORDER BY start_class_time_
     </select>