fix：1、课程合并去掉部分限制

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentServeServiceImpl.java

@@ -451,7 +451,11 @@ public class StudentServeServiceImpl implements StudentServeService {
                 }
                 s.setServeType(result.getServeType());
                 s.setCourseIds(StringUtils.join(courseIds, ","));
-                s.setExpectExercisesNum(courseIds.size());
+                if(StringUtils.isBlank(s.getCourseIds())){
+                    s.setExpectExercisesNum(1);
+                }else{
+                    s.setExpectExercisesNum(courseIds.size());
+                }
                 updateService.add(s);
             }else{
                 newService.add(result);

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

@@ -530,7 +530,7 @@
                 AND FIND_IN_SET(cs.organ_id_,#{organId})
             </if>
         </where>
-        ORDER BY cs.id_ asc
+        ORDER BY CONCAT(cs.class_date_, ' ', cs.start_class_time_) asc
         <include refid="global.limit"/>
     </select>
     

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

@@ -480,7 +480,7 @@
         <result column="type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="actual_teacher_id_" property="actualTeacherId"/>
         <result column="course_start_time_" property="courseStartTime"/>
-        <result column="" property="teachMode"/>
+        <result column="teach_mode_" property="teachMode"/>
     </resultMap>
 
     <select id="getStudentFutureCourseInfo" resultMap="StudentServeCourseDto">

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

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