Selaa lähdekoodia

1、作业消息推送
2、对外课程组查看
3、课外训练调整

Joburgess 5 vuotta sitten
vanhempi
commit
2feb0e575d

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

@@ -33,14 +33,24 @@ public class ExtraExercilseReplyQueryInfo extends QueryInfo {
 
 	private Date submitEndTime;// 提交作业的结束时间
 
-	private Date expireDate;
+	private Date expireStartDate;
 
-	public Date getExpireDate() {
-		return expireDate;
+	private Date expireEndDate;
+
+	public Date getExpireStartDate() {
+		return expireStartDate;
+	}
+
+	public void setExpireStartDate(Date expireStartDate) {
+		this.expireStartDate = expireStartDate;
+	}
+
+	public Date getExpireEndDate() {
+		return expireEndDate;
 	}
 
-	public void setExpireDate(Date expireDate) {
-		this.expireDate = expireDate;
+	public void setExpireEndDate(Date expireEndDate) {
+		this.expireEndDate = expireEndDate;
 	}
 
 	public Long getExtracurricularExercisesId() {

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

@@ -270,8 +270,8 @@
 			<if test="submitEndTime != null">
 				AND date(eer.create_time_) &lt;= #{submitEndTime}
 			</if>
-			<if test="expireDate != null">
-				AND DATE_FORMAT(ee.expire_date_,"%Y%m%d") = DATE_FORMAT(#{expireDate},"%Y%m%d")
+			<if test="expireStartDate != null and expireEndDate != null">
+				AND DATE_FORMAT(ee.expire_date_,"%Y%m%d") &gt;= DATE_FORMAT(#{expireStartDate},"%Y%m%d") AND DATE_FORMAT(ee.expire_date_,"%Y%m%d") &lt;= DATE_FORMAT(#{expireEndDate},"%Y%m%d")
 			</if>
 		</where>
 	</sql>