update:课表列表新增条件查询

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

@@ -43,11 +43,17 @@ public class EndCourseScheduleQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "教师名称")
     private String teacherName;
 
-    @ApiModelProperty(value = "开始时间")
+    @ApiModelProperty(value = "上课开始时间")
     private Date startTime;
 
-    @ApiModelProperty(value = "结束时间")
+    @ApiModelProperty(value = "上课结束时间")
     private Date endTime;
+    
+    @ApiModelProperty(value = "课程创建开始时间")
+    private Date createStartDate;
+    
+    @ApiModelProperty(value = "课程创建结束时间")
+    private Date createEndDate;
 
     @ApiModelProperty(value = "课程状态")
     private CourseStatusEnum courseStatus;
@@ -201,4 +207,20 @@ public class EndCourseScheduleQueryInfo extends QueryInfo {
     public void setClassGroupId(Integer classGroupId) {
         this.classGroupId = classGroupId;
     }
+
+	public Date getCreateStartDate() {
+		return createStartDate;
+	}
+
+	public void setCreateStartDate(Date createStartDate) {
+		this.createStartDate = createStartDate;
+	}
+
+	public Date getCreateEndDate() {
+		return createEndDate;
+	}
+
+	public void setCreateEndDate(Date createEndDate) {
+		this.createEndDate = createEndDate;
+	}
 }

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

@@ -2417,21 +2417,27 @@
         <if test="isCallNames != null and isCallNames == 0">
             AND sa.id_ IS NULL
         </if>
-        <if test="startTime!=null and endTime==null">
-            AND cs.class_date_ &gt; DATE_FORMAT(#{startTime},"%Y-%m-%d")
+        <if test="startTime!=null">
+            AND cs.class_date_ &gt;= DATE_FORMAT(#{startTime},"%Y-%m-%d")
         </if>
-        <if test="startTime==null and endTime!=null">
-            AND cs.class_date_ &lt; DATE_FORMAT(#{endTime},"%Y-%m-%d")
-        </if>
-        <if test="startTime!=null and endTime!=null">
-            AND cs.class_date_ BETWEEN DATE_FORMAT(#{startTime},"%Y-%m-%d") AND DATE_FORMAT(#{endTime},"%Y-%m-%d")
+        <if test="endTime!=null">
+            AND cs.class_date_ &lt;= DATE_FORMAT(#{endTime},"%Y-%m-%d")
         </if>
         <if test="courseStatus!=null">
             AND cs.status_ = #{courseStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
         </if>
+        <if test="createStartDate!=null">
+            AND date(cs.create_time_) &lt;= date(#{createStartDate})
+        </if>
+        <if test="createEndDate!=null">
+            AND date(cs.create_time_) &lt;= date(#{createEndDate})
+        </if>
         <if test="courseType!=null">
             AND cs.type_ = #{courseType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
         </if>
+        <if test="groupType!=null">
+            AND cs.group_type_ = #{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+        </if>
         <if test="schoolId!=null">
             AND cs.schoole_id_ = #{schoolId}
         </if>