update

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

@@ -13,6 +13,10 @@ public class TeacherAttendanceComplaintsDto{
 
     private String courseScheduleTime;
 
+    private String courseScheduleStartTime;
+
+    private String courseScheduleEndTime;
+
     private SignInStatusEnum signInStatus;
 
     private SignOutStatusEnum signOutStatus;
@@ -31,6 +35,22 @@ public class TeacherAttendanceComplaintsDto{
 
     private String disposeContent;
 
+    public String getCourseScheduleEndTime() {
+        return courseScheduleEndTime;
+    }
+
+    public void setCourseScheduleEndTime(String courseScheduleEndTime) {
+        this.courseScheduleEndTime = courseScheduleEndTime;
+    }
+
+    public String getCourseScheduleStartTime() {
+        return courseScheduleStartTime;
+    }
+
+    public void setCourseScheduleStartTime(String courseScheduleStartTime) {
+        this.courseScheduleStartTime = courseScheduleStartTime;
+    }
+
     public String getSignInTime() {
         return signInTime;
     }

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

@@ -467,8 +467,10 @@
         <result property="courseScheduleId" column="course_schedule_id_"/>
         <result property="courseScheduleName" column="course_schedule_name_"/>
         <result property="courseScheduleTime" column="course_schedule_time_"/>
+        <result property="courseScheduleStartTime" column="start_class_time_"/>
+        <result property="courseScheduleEndTime" column="end_class_time_"/>
         <result property="signInStatus" column="sign_in_status_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result property="signOutStatus" column="sign_out_status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result property="signOutStatus" column="sign_out_status_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result property="teacherName" column="teacher_name_"/>
         <result property="complaintsStatusEnum" column="complaints_status_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result property="operatorName" column="operator_name_"/>
@@ -482,7 +484,7 @@
         IF(ta.sign_in_status_ IS NULL,3,ta.sign_in_status_) sign_in_status_,
         IF(ta.sign_out_status_ IS NULL,3,ta.sign_out_status_) sign_out_status_,
         suo.real_name_ operator_name_,su.real_name_ teacher_name_,ta.complaints_status_,ta.sign_in_time_,ta.sign_out_time_
-        ,ta.complaints_content_,ta.dispose_content_
+        ,ta.complaints_content_,ta.dispose_content_,cs.end_class_time_,cs.start_class_time_
         FROM teacher_attendance ta
         LEFT JOIN sys_user su ON ta.teacher_id_ = su.id_
         LEFT JOIN teacher t ON t.id_ = su.id_

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

@@ -94,7 +94,7 @@ public class TeacherAttendanceController extends BaseController {
         return succeed(teacherAttendanceService.queryTeacherAttendanceComplaints(queryInfo));
     }
 
-    @ApiOperation(value = "同意教师课酬申述")
+    @ApiOperation(value = "同意教师异常考勤申述")
     @PostMapping("/agreeTeacherAttendanceComplaints")
     @PreAuthorize("@pcs.hasPermissions('teacherAttendance/agreeTeacherAttendanceComplaints')")
     public Object agreeTeacherAttendanceComplaints(Integer signInStatus,Integer signOutStatus,long teacherAttendanceId,String content){
@@ -102,7 +102,7 @@ public class TeacherAttendanceController extends BaseController {
         return succeed();
     }
 
-    @ApiOperation(value = "拒绝教师课酬申述")
+    @ApiOperation(value = "拒绝教师异常考勤申述")
     @PostMapping("/rejectTeacherAttendanceComplaints")
     @PreAuthorize("@pcs.hasPermissions('teacherAttendance/rejectTeacherAttendanceComplaints')")
     public Object rejectTeacherAttendanceComplaints(long teacherAttendanceId,String content){