Merge remote-tracking branch 'origin/master'

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

@@ -9,6 +9,8 @@ import java.util.Date;
  * @Date 2020/3/26
  */
 public class ExtraExercilseReplyQueryInfo extends QueryInfo {
+	
+	private Long extracurricularExercisesId;
 
 	private Integer teacherId;
 
@@ -20,6 +22,14 @@ public class ExtraExercilseReplyQueryInfo extends QueryInfo {
 
 	private Date submitEndTime;// 提交作业的结束时间
 
+	public Long getExtracurricularExercisesId() {
+		return extracurricularExercisesId;
+	}
+
+	public void setExtracurricularExercisesId(Long extracurricularExercisesId) {
+		this.extracurricularExercisesId = extracurricularExercisesId;
+	}
+
 	public Integer getTeacherId() {
 		return teacherId;
 	}

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

@@ -31,6 +31,9 @@
 
 	<sql id="queryPageCondition">
 		<where>
+			<if test="extracurricularExercisesId != null">
+				extracurricular_exercises_id_ = #{extracurricularExercisesId}
+			</if>
 			<if test="teacherId != null">
 				teacher_id_ = #{teacherId}
 			</if>