Revert "1、服务指标导出增加作业提交时间； 2、vip课休学状态增加退学操作； 3、本周应布置课外训练推送；"

This reverts commit 3467e029

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

@@ -191,45 +191,23 @@
 				<if test="actualExercisesNumIsAchieve!=null and actualExercisesNumIsAchieve==1">
 					SUM( actual_exercises_num_ )&gt;=SUM( expect_exercises_num_ ) and
 				</if>
-				<if test="submitStartDate==null or submitEndDate==null">
-					<if test="exercisesReplyNumIsAchieve!=null and exercisesReplyNumIsAchieve==0">
-						SUM( exercises_reply_num_ ) &lt; SUM( expect_exercises_num_ ) and
-					</if>
-					<if test="exercisesReplyNumIsAchieve!=null and exercisesReplyNumIsAchieve==1">
-						SUM( exercises_reply_num_ ) &gt;= SUM( expect_exercises_num_ ) and
-					</if>
-					<if test="exercisesMessageNumIsAchieve!=null and exercisesMessageNumIsAchieve==0">
-						SUM( exercises_message_num_ ) &lt; SUM( expect_exercises_num_ ) and
-					</if>
-					<if test="exercisesMessageNumIsAchieve!=null and exercisesMessageNumIsAchieve==1">
-						SUM( exercises_message_num_ ) &gt;= SUM( expect_exercises_num_ ) and
-					</if>
-					<if test="exercisesMessageTimelyNumIsAchieve!=null and exercisesMessageTimelyNumIsAchieve==0">
-						SUM( exercises_message_timely_num_ ) &lt; SUM( expect_exercises_num_ ) and
-					</if>
-					<if test="exercisesMessageTimelyNumIsAchieve!=null and exercisesMessageTimelyNumIsAchieve==1">
-						SUM( exercises_message_timely_num_ ) &gt;= SUM( expect_exercises_num_ ) and
-					</if>
+				<if test="exercisesReplyNumIsAchieve!=null and exercisesReplyNumIsAchieve==0">
+					SUM( exercises_reply_num_ ) &lt; SUM( expect_exercises_num_ ) and
 				</if>
-				<if test="submitStartDate!=null and submitEndDate!=null">
-					<if test="exercisesReplyNumIsAchieve!=null and exercisesReplyNumIsAchieve==0">
-						SUM(IF(DATE_FORMAT(last_submit_time_, '%Y-%m-%d') BETWEEN #{submitStartDate} AND #{submitEndDate},exercises_reply_num_,0)) &lt; SUM( expect_exercises_num_ ) and
-					</if>
-					<if test="exercisesReplyNumIsAchieve!=null and exercisesReplyNumIsAchieve==1">
-						SUM(IF(DATE_FORMAT(last_submit_time_, '%Y-%m-%d') BETWEEN #{submitStartDate} AND #{submitEndDate},exercises_reply_num_,0)) &gt;= SUM( expect_exercises_num_ ) and
-					</if>
-					<if test="exercisesMessageNumIsAchieve!=null and exercisesMessageNumIsAchieve==0">
-						SUM(IF(DATE_FORMAT(last_submit_time_, '%Y-%m-%d') BETWEEN #{submitStartDate} AND #{submitEndDate},exercises_message_num_,0)) &lt; SUM( expect_exercises_num_ ) and
-					</if>
-					<if test="exercisesMessageNumIsAchieve!=null and exercisesMessageNumIsAchieve==1">
-						SUM(IF(DATE_FORMAT(last_submit_time_, '%Y-%m-%d') BETWEEN #{submitStartDate} AND #{submitEndDate},exercises_message_num_,0)) &gt;= SUM( expect_exercises_num_ ) and
-					</if>
-					<if test="exercisesMessageTimelyNumIsAchieve!=null and exercisesMessageTimelyNumIsAchieve==0">
-						SUM(IF(DATE_FORMAT(last_submit_time_, '%Y-%m-%d') BETWEEN #{submitStartDate} AND #{submitEndDate},exercises_message_timely_num_,0)) &lt; SUM( expect_exercises_num_ ) and
-					</if>
-					<if test="exercisesMessageTimelyNumIsAchieve!=null and exercisesMessageTimelyNumIsAchieve==1">
-						SUM(IF(DATE_FORMAT(last_submit_time_, '%Y-%m-%d') BETWEEN #{submitStartDate} AND #{submitEndDate},exercises_message_timely_num_,0)) &gt;= SUM( expect_exercises_num_ ) and
-					</if>
+				<if test="exercisesReplyNumIsAchieve!=null and exercisesReplyNumIsAchieve==1">
+					SUM( exercises_reply_num_ ) &gt;= SUM( expect_exercises_num_ ) and
+				</if>
+				<if test="exercisesMessageNumIsAchieve!=null and exercisesMessageNumIsAchieve==0">
+					SUM( exercises_message_num_ ) &lt; SUM( expect_exercises_num_ ) and
+				</if>
+				<if test="exercisesMessageNumIsAchieve!=null and exercisesMessageNumIsAchieve==1">
+					SUM( exercises_message_num_ ) &gt;= SUM( expect_exercises_num_ ) and
+				</if>
+				<if test="exercisesMessageTimelyNumIsAchieve!=null and exercisesMessageTimelyNumIsAchieve==0">
+					SUM( exercises_message_timely_num_ ) &lt; SUM( expect_exercises_num_ ) and
+				</if>
+				<if test="exercisesMessageTimelyNumIsAchieve!=null and exercisesMessageTimelyNumIsAchieve==1">
+					SUM( exercises_message_timely_num_ ) &gt;= SUM( expect_exercises_num_ ) and
 				</if>
 			</trim>
 		ORDER BY student_id_
@@ -280,45 +258,23 @@
 				<if test="actualExercisesNumIsAchieve!=null and actualExercisesNumIsAchieve==1">
 					SUM( actual_exercises_num_ )&gt;=SUM( expect_exercises_num_ ) and
 				</if>
-				<if test="submitStartDate==null or submitEndDate==null">
-					<if test="exercisesReplyNumIsAchieve!=null and exercisesReplyNumIsAchieve==0">
-						SUM( exercises_reply_num_ ) &lt; SUM( expect_exercises_num_ ) and
-					</if>
-					<if test="exercisesReplyNumIsAchieve!=null and exercisesReplyNumIsAchieve==1">
-						SUM( exercises_reply_num_ ) &gt;= SUM( expect_exercises_num_ ) and
-					</if>
-					<if test="exercisesMessageNumIsAchieve!=null and exercisesMessageNumIsAchieve==0">
-						SUM( exercises_message_num_ ) &lt; SUM( expect_exercises_num_ ) and
-					</if>
-					<if test="exercisesMessageNumIsAchieve!=null and exercisesMessageNumIsAchieve==1">
-						SUM( exercises_message_num_ ) &gt;= SUM( expect_exercises_num_ ) and
-					</if>
-					<if test="exercisesMessageTimelyNumIsAchieve!=null and exercisesMessageTimelyNumIsAchieve==0">
-						SUM( exercises_message_timely_num_ ) &lt; SUM( expect_exercises_num_ ) and
-					</if>
-					<if test="exercisesMessageTimelyNumIsAchieve!=null and exercisesMessageTimelyNumIsAchieve==1">
-						SUM( exercises_message_timely_num_ ) &gt;= SUM( expect_exercises_num_ ) and
-					</if>
+				<if test="exercisesReplyNumIsAchieve!=null and exercisesReplyNumIsAchieve==0">
+					SUM( exercises_reply_num_ ) &lt; SUM( expect_exercises_num_ ) and
+				</if>
+				<if test="exercisesReplyNumIsAchieve!=null and exercisesReplyNumIsAchieve==1">
+					SUM( exercises_reply_num_ ) &gt;= SUM( expect_exercises_num_ ) and
+				</if>
+				<if test="exercisesMessageNumIsAchieve!=null and exercisesMessageNumIsAchieve==0">
+					SUM( exercises_message_num_ ) &lt; SUM( expect_exercises_num_ ) and
+				</if>
+				<if test="exercisesMessageNumIsAchieve!=null and exercisesMessageNumIsAchieve==1">
+					SUM( exercises_message_num_ ) &gt;= SUM( expect_exercises_num_ ) and
+				</if>
+				<if test="exercisesMessageTimelyNumIsAchieve!=null and exercisesMessageTimelyNumIsAchieve==0">
+					SUM( exercises_message_timely_num_ ) &lt; SUM( expect_exercises_num_ ) and
 				</if>
-				<if test="submitStartDate!=null and submitEndDate!=null">
-					<if test="exercisesReplyNumIsAchieve!=null and exercisesReplyNumIsAchieve==0">
-						SUM(IF(DATE_FORMAT(last_submit_time_, '%Y-%m-%d') BETWEEN #{submitStartDate} AND #{submitEndDate},exercises_reply_num_,0)) &lt; SUM( expect_exercises_num_ ) and
-					</if>
-					<if test="exercisesReplyNumIsAchieve!=null and exercisesReplyNumIsAchieve==1">
-						SUM(IF(DATE_FORMAT(last_submit_time_, '%Y-%m-%d') BETWEEN #{submitStartDate} AND #{submitEndDate},exercises_reply_num_,0)) &gt;= SUM( expect_exercises_num_ ) and
-					</if>
-					<if test="exercisesMessageNumIsAchieve!=null and exercisesMessageNumIsAchieve==0">
-						SUM(IF(DATE_FORMAT(last_submit_time_, '%Y-%m-%d') BETWEEN #{submitStartDate} AND #{submitEndDate},exercises_message_num_,0)) &lt; SUM( expect_exercises_num_ ) and
-					</if>
-					<if test="exercisesMessageNumIsAchieve!=null and exercisesMessageNumIsAchieve==1">
-						SUM(IF(DATE_FORMAT(last_submit_time_, '%Y-%m-%d') BETWEEN #{submitStartDate} AND #{submitEndDate},exercises_message_num_,0)) &gt;= SUM( expect_exercises_num_ ) and
-					</if>
-					<if test="exercisesMessageTimelyNumIsAchieve!=null and exercisesMessageTimelyNumIsAchieve==0">
-						SUM(IF(DATE_FORMAT(last_submit_time_, '%Y-%m-%d') BETWEEN #{submitStartDate} AND #{submitEndDate},exercises_message_timely_num_,0)) &lt; SUM( expect_exercises_num_ ) and
-					</if>
-					<if test="exercisesMessageTimelyNumIsAchieve!=null and exercisesMessageTimelyNumIsAchieve==1">
-						SUM(IF(DATE_FORMAT(last_submit_time_, '%Y-%m-%d') BETWEEN #{submitStartDate} AND #{submitEndDate},exercises_message_timely_num_,0)) &gt;= SUM( expect_exercises_num_ ) and
-					</if>
+				<if test="exercisesMessageTimelyNumIsAchieve!=null and exercisesMessageTimelyNumIsAchieve==1">
+					SUM( exercises_message_timely_num_ ) &gt;= SUM( expect_exercises_num_ ) and
 				</if>
 			</trim>
 		) tmp