Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -42,6 +42,28 @@ public class StudentExercisesSituationQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "是否存在网管课")
     private Integer existPracticeCourse;
 
+    @ApiModelProperty(value = "作业提交起始时间")
+    private Date submitStartDate;
+
+    @ApiModelProperty(value = "作业提交截至时间")
+    private Date submitEndDate;
+
+    public Date getSubmitStartDate() {
+        return submitStartDate;
+    }
+
+    public void setSubmitStartDate(Date submitStartDate) {
+        this.submitStartDate = submitStartDate;
+    }
+
+    public Date getSubmitEndDate() {
+        return submitEndDate;
+    }
+
+    public void setSubmitEndDate(Date submitEndDate) {
+        this.submitEndDate = submitEndDate;
+    }
+
     public Integer getExistPracticeCourse() {
         return existPracticeCourse;
     }

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

@@ -140,9 +140,16 @@
 			o.name_ organ_name_,
 			SUM( expect_exercises_num_ ) expect_exercises_num_,
 			SUM( actual_exercises_num_ ) actual_exercises_num_,
-			SUM( exercises_reply_num_ ) exercises_reply_num_,
-			SUM( exercises_message_num_ ) exercises_message_num_,
-			SUM( exercises_message_timely_num_ ) exercises_message_timely_num_,
+			<if test="submitStartDate==null or submitEndDate==null">
+				SUM( exercises_reply_num_ ) exercises_reply_num_,
+				SUM( exercises_message_num_ ) exercises_message_num_,
+				SUM( exercises_message_timely_num_ ) exercises_message_timely_num_,
+			</if>
+			<if test="submitStartDate!=null and submitEndDate!=null">
+				SUM(IF(last_submit_time_ BETWEEN #{submitStartDate} AND #{submitEndDate},exercises_reply_num_,0)) exercises_reply_num_,
+				SUM(IF(last_submit_time_ BETWEEN #{submitStartDate} AND #{submitEndDate},exercises_message_num_,0)) exercises_message_num_,
+				SUM(IF(last_submit_time_ BETWEEN #{submitStartDate} AND #{submitEndDate},exercises_message_timely_num_,0)) exercises_message_timely_num_,
+			</if>
 			MAX(last_submit_time_) last_submit_time_
 		FROM
 			student_extracurricular_exercises_situation_ sees