Merge remote-tracking branch 'origin/online1' into online1

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

@@ -35,6 +35,9 @@ public class TeacherAttendancesDto {
     @ApiModelProperty(value = "课程名",required = false)
     private String courseScheduleName;
 
+    @ApiModelProperty(value = "处理意见",required = false)
+    private String disposeContent;
+
     @ApiModelProperty(value = "课程状态",required = false)
     private CourseStatusEnum courseScheduleStatus;
 
@@ -76,6 +79,14 @@ public class TeacherAttendancesDto {
     @ApiModelProperty(value = "申述处理状态",required = false)
     private ComplaintsStatusEnum complaintsStatus;
 
+    public String getDisposeContent() {
+        return disposeContent;
+    }
+
+    public void setDisposeContent(String disposeContent) {
+        this.disposeContent = disposeContent;
+    }
+
     public Long getTeacherAttendanceId() {
         return teacherAttendanceId;
     }

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

@@ -238,6 +238,7 @@
         <result column="course_schedule_type_" property="courseScheduleType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="course_schedule_status_" property="courseScheduleStatus" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="course_schedule_name_" property="courseScheduleName"/>
+        <result column="dispose_content_" property="disposeContent"/>
         <result column="teacher_name_" property="teacherName"/>
         <result column="job_nature_" property="jobNature" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="organ_name_" property="organName"/>
@@ -349,7 +350,8 @@
         cs.class_date_,cs.start_class_time_,cs.end_class_time_,cs.type_ course_schedule_type_,
         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_,
-        ta.sign_in_time_,ta.sign_out_time_,ta.remark_,o.name_ organ_name_,t.job_nature_,ta.complaints_status_,ta.id_ teacher_attendance_id_
+        ta.sign_in_time_,ta.sign_out_time_,ta.remark_,o.name_ organ_name_,t.job_nature_,
+        ta.complaints_status_,ta.id_ teacher_attendance_id_,ta.dispose_content_
         FROM course_schedule_teacher_salary csts
         LEFT JOIN course_schedule cs ON cs.id_ = csts.course_schedule_id_
         LEFT JOIN teacher_attendance ta ON ta.course_schedule_id_ = csts.course_schedule_id_ AND ta.teacher_id_ = csts.user_id_