Merge remote-tracking branch 'origin/master'

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

@@ -19,6 +19,9 @@ public class TeacherCloseQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "课程类型")
     private String courseScheduleType;
 
+    @ApiModelProperty(value = "课程状态")
+    private String courseScheduleStatus;
+
     @ApiModelProperty(value = "课程名称")
     private String classGroupName;
 
@@ -31,6 +34,14 @@ public class TeacherCloseQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "分部")
     private String organId;
 
+    public String getCourseScheduleStatus() {
+        return courseScheduleStatus;
+    }
+
+    public void setCourseScheduleStatus(String courseScheduleStatus) {
+        this.courseScheduleStatus = courseScheduleStatus;
+    }
+
     public String getSignOutStatus() {
         return signOutStatus;
     }

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

@@ -222,10 +222,10 @@
             <if test="search != null and search != ''">
                 AND (su.id_ = #{search} OR su.real_name_ LIKE CONCAT('%',#{search},'%') OR cs.id_ = #{search} OR cs.name_ LIKE CONCAT('%',#{search},'%'))
             </if>
-            <if test="courseStartDate != null">
+            <if test="courseStartDate != null and courseStartDate != ''">
                 AND cs.class_date_ &gt;= #{courseStartDate}
             </if>
-            <if test="courseEndDate != null">
+            <if test="courseEndDate != null and courseEndDate != ''">
                 AND cs.class_date_ &lt;= #{courseEndDate}
             </if>
             <if test="signInStatus != null and signInStatus != '' and signInStatus != 3">
@@ -240,9 +240,12 @@
             <if test="signInStatus != null and signInStatus != '' and signInStatus == 3">
                 AND ta.sign_in_status_ IS NULL
             </if>
-            <if test="courseScheduleType != null">
+            <if test="courseScheduleType != null  and courseScheduleType != ''">
                 AND cs.type_ = #{courseScheduleType}
             </if>
+            <if test="courseScheduleStatus != null  and courseScheduleStatus != ''">
+                AND cs.status_ = #{courseScheduleStatus}
+            </if>
             <if test="organId != null and organId != ''">
                 AND FIND_IN_SET(t.organ_id_,#{organId})
             </if>