update

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

@@ -44,9 +44,6 @@ public class CourseScheduleDto extends CourseSchedule {
     @ApiModelProperty(value = "教师角色")
     private TeachTypeEnum teacherRole;
 
-    @ApiModelProperty(value = "投诉状态")
-    private Integer complaintStatus;
-
     private String subjectName;
 
     private String subjectId;
@@ -73,7 +70,7 @@ public class CourseScheduleDto extends CourseSchedule {
     private int isComplaints;
 
     //申述状态0拒绝1通过2待处理3已撤销
-    private int complaintsStatus;
+    private Integer complaintsStatus;
 
     //申述内容
     private String complaintsContent;
@@ -83,11 +80,11 @@ public class CourseScheduleDto extends CourseSchedule {
 
     private int isNew;
 
-    public int getComplaintsStatus() {
+    public Integer getComplaintsStatus() {
         return complaintsStatus;
     }
 
-    public void setComplaintsStatus(int complaintsStatus) {
+    public void setComplaintsStatus(Integer complaintsStatus) {
         this.complaintsStatus = complaintsStatus;
     }
 
@@ -179,14 +176,6 @@ public class CourseScheduleDto extends CourseSchedule {
         this.subjectName = subjectName;
     }
 
-    public Integer getComplaintStatus() {
-        return complaintStatus;
-    }
-
-    public void setComplaintStatus(Integer complaintStatus) {
-        this.complaintStatus = complaintStatus;
-    }
-
     public TeachTypeEnum getTeacherRole() {
         return teacherRole;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/page/TeacherAttendanceComplaintsQueryInfo.java

@@ -14,15 +14,26 @@ public class TeacherAttendanceComplaintsQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "申述状态")
     private String complaintsStatus;
 
-    @ApiModelProperty(value = "课程时间")
-    private String courseScheduleDate;
+    @ApiModelProperty(value = "课程开始时间")
+    private String courseScheduleStartDate;
 
-    public String getCourseScheduleDate() {
-        return courseScheduleDate;
+    @ApiModelProperty(value = "课程结束时间")
+    private String courseScheduleEndDate;
+
+    public String getCourseScheduleStartDate() {
+        return courseScheduleStartDate;
+    }
+
+    public void setCourseScheduleStartDate(String courseScheduleStartDate) {
+        this.courseScheduleStartDate = courseScheduleStartDate;
+    }
+
+    public String getCourseScheduleEndDate() {
+        return courseScheduleEndDate;
     }
 
-    public void setCourseScheduleDate(String courseScheduleDate) {
-        this.courseScheduleDate = courseScheduleDate;
+    public void setCourseScheduleEndDate(String courseScheduleEndDate) {
+        this.courseScheduleEndDate = courseScheduleEndDate;
     }
 
     public String getOrganId() {

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

@@ -996,11 +996,11 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
             }
 			List<CourseScheduleReview> courseScheduleReviews = idCourseReview.get(courseScheduleDto.getId().intValue());
             if(!CollectionUtils.isEmpty(courseScheduleReviews)){
-				courseScheduleDto.setComplaintStatus(1);
+				courseScheduleDto.setComplaintsStatus(1);
 				CourseScheduleReview courseScheduleReview = courseScheduleReviews.get(0);
 				courseScheduleDto.setReviewId(courseScheduleReview.getId());
 			}else{
-            	courseScheduleDto.setComplaintStatus(0);
+            	courseScheduleDto.setComplaintsStatus(0);
 			}
 		}
         return teacherCourseSchedulesWithDate;

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

@@ -23,6 +23,12 @@
         <result column="sign_in_longitude_latitude_" property="signInLongitudeLatitude"/>
         <result column="sign_out_longitude_latitude_" property="signOutLongitudeLatitude"/>
         <result column="longitude_latitude_" property="schoolLongitudeLatitude"/>
+        <result column="is_complaints_" property="isComplaints"/>
+        <result column="complaints_status_" property="complaintsStatus" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="complaints_content_" property="complaintsContent"/>
+        <result column="dispose_content_" property="disposeContent"/>
+        <result column="operator_" property="operator"/>
+        <result column="complaints_time_" property="complaintsTime"/>
     </resultMap>
     
     <resultMap type="com.ym.mec.biz.dal.dto.Mapper" id="Mapper">
@@ -122,7 +128,7 @@
                 is_complaints_ = #{isComplaints},
             </if>
             <if test="complaintsStatus != null">
-                complaints_status_ = #{complaintsStatus},
+                complaints_status_ = #{complaintsStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
             <if test="complaintsContent != null and complaintsContent != ''">
                 complaints_content_ = #{complaintsContent},
@@ -461,10 +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="signInStatus" column="sign_in_status_"/>
-        <result property="signOutStatus" column="sign_out_status"/>
+        <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="teacherName" column="teacher_name_"/>
-        <result property="complaintsStatusEnum" column="complain_status_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result property="complaintsStatusEnum" column="complaints_status_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result property="operatorName" column="operator_name_"/>
         <result property="signInTime" column="sign_in_time_"/>
         <result property="signOutTime" column="sign_out_time_"/>
@@ -489,7 +495,7 @@
     </select>
     <sql id="queryTeacherAttendanceComplaintsSql">
         <where>
-            cs.actual_teacher_id_ = ta.teacher_id_
+            cs.actual_teacher_id_ = ta.teacher_id_ AND ta.is_complaints_ = 1
             <if test="organId != null and organId != ''">
                 AND t.organ_id_ = #{organId}
             </if>
@@ -502,8 +508,11 @@
             <if test="search != null and search != ''">
                 AND (su.real_name_ LIKE CONCAT('%',#{search},'%') OR ta.teacher_id_ = #{search})
             </if>
-            <if test="courseScheduleDate != null and courseScheduleDate != ''">
-                AND cs.class_date_ = #{courseScheduleDate}
+            <if test="courseScheduleStartDate != null and courseScheduleStartDate != ''">
+                AND cs.class_date_ >= #{courseScheduleStartDate}
+            </if>
+            <if test="courseScheduleEndDate != null and courseScheduleEndDate != ''">
+                AND cs.class_date_ &lt;= #{courseScheduleEndDate}
             </if>
         </where>
     </sql>

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

@@ -19,7 +19,6 @@ import com.ym.mec.biz.dal.page.StudentAttendanceQueryInfo;
 import com.ym.mec.biz.service.CourseScheduleService;
 import com.ym.mec.biz.service.StudentAttendanceService;
 import com.ym.mec.biz.service.SysConfigService;
-import com.ym.mec.biz.service.VipGroupService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.QueryInfo;
@@ -123,6 +122,7 @@ public class TeacherCourseScheduleController extends BaseController {
         Map<String,Object> result = new HashMap<>();
         result.put("rows",teacherCourseSchedulesWithDate);
         result.put("appealDaysRange",1);
+        result.put("complaintsDaysRange",1);
         return succeed(result);
     }