fix：1、作业改造

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

@@ -251,11 +251,11 @@
 			AND actual_exercises_num_ < expect_exercises_num_
 		</if>
 		<if test="actualExercisesNumIsAchieve!=null and actualExercisesNumIsAchieve==1">
-			AND actual_exercises_num_ &gt;= expect_exercises_num_ and
+			AND actual_exercises_num_ &gt;= expect_exercises_num_
 		</if>
 		<if test="submitStartDate==null or submitEndDate==null">
 			<if test="exercisesReplyNumIsAchieve!=null and exercisesReplyNumIsAchieve==0">
-				AND exercises_reply_num_ &lt; SUM( actual_exercises_num_ ) and
+				AND exercises_reply_num_ &lt; SUM( actual_exercises_num_ )
 			</if>
 			<if test="exercisesReplyNumIsAchieve!=null and exercisesReplyNumIsAchieve==1">
 				AND exercises_reply_num_ &gt;= actual_exercises_num_
@@ -339,11 +339,11 @@
 			AND actual_exercises_num_ &lt; expect_exercises_num_
 		</if>
 		<if test="actualExercisesNumIsAchieve!=null and actualExercisesNumIsAchieve==1">
-			AND actual_exercises_num_ &gt;= expect_exercises_num_ and
+			AND actual_exercises_num_ &gt;= expect_exercises_num_
 		</if>
 		<if test="submitStartDate==null or submitEndDate==null">
 			<if test="exercisesReplyNumIsAchieve!=null and exercisesReplyNumIsAchieve==0">
-				AND exercises_reply_num_ &lt; SUM( actual_exercises_num_ ) and
+				AND exercises_reply_num_ &lt; SUM( actual_exercises_num_ )
 			</if>
 			<if test="exercisesReplyNumIsAchieve!=null and exercisesReplyNumIsAchieve==1">
 				AND exercises_reply_num_ &gt;= actual_exercises_num_

mec-web/src/main/java/com/ym/mec/web/controller/TaskController.java

@@ -263,7 +263,8 @@ public class TaskController extends BaseController {
 	//学生服务信息统计
 	@GetMapping("/exercisesSituationStatistics")
 	public void exercisesSituationStatistics(){
-		studentServeService.exercisesSituationStatistics2(null,new ArrayList<>(Arrays.asList(1095257)));
+		studentServeService.exercisesSituationStatistics2(null,null);
+//		studentServeService.exercisesSituationStatistics2(null,new ArrayList<>(Arrays.asList(1095257)));
 //		studentServeService.exercisesSituationStatistics(null);
 	}