Joburgess 5 年 前
コミット
360ee1a93f

+ 5 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupServiceImpl.java

@@ -1649,7 +1649,11 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                         currentCourseTeachingTeachers.add(currentBishopTeacher.get(0));
                     }
                     e.setTeachingTeachers(currentCourseTeachingTeachers);
-                    e.setTeacherNum(currentCourseTeachingTeachers.size());
+                    if(Objects.isNull(currentCourseTeachingTeachers)){
+                        e.setTeacherNum(0);
+                    }else{
+                        e.setTeacherNum(currentCourseTeachingTeachers.size());
+                    }
                 }
             });
         }

+ 24 - 24
mec-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -462,30 +462,30 @@
 
     <select id="getTeacherCourseSchedulesWithDate" resultMap="courseScheduleDto">
         SELECT
-        cs.id_ seal_class_id_,
-        cg.name_,
-        su.username_ teacher_name_,
-        cs.type_,
-        cs.id_,
-        cs.class_group_id_,
-        cs.class_date_,
-        CONCAT(cs.class_date_,' ',cs.start_class_time_) start_class_time_,
-        CONCAT(cs.class_date_,' ',cs.end_class_time_) end_class_time_,
-        cs.status_,
-        csts.user_id_ actual_teacher_id_,
-        csts.teacher_role_,
-        cs.schoole_id_,
-        s.name_ school_name_,
-        if(ta.sign_in_status_ IS NULL,3,ta.sign_in_status_) sign_in_status_,
-        if(ta.sign_out_status_ IS NULL,3,ta.sign_out_status_) sign_out_status_,
-        cs.teach_mode_
+            cs.id_ seal_class_id_,
+            cg.name_,
+            su.username_ teacher_name_,
+            cs.type_,
+            cs.id_,
+            cs.class_group_id_,
+            cs.class_date_,
+            CONCAT(cs.class_date_,' ',cs.start_class_time_) start_class_time_,
+            CONCAT(cs.class_date_,' ',cs.end_class_time_) end_class_time_,
+            cs.status_,
+            csts.user_id_ actual_teacher_id_,
+            csts.teacher_role_,
+            cs.schoole_id_,
+            s.name_ school_name_,
+            if(ta.sign_in_status_ IS NULL,3,ta.sign_in_status_) sign_in_status_,
+            if(ta.sign_out_status_ IS NULL,3,ta.sign_out_status_) sign_out_status_,
+            cs.teach_mode_
         FROM
-        course_schedule_teacher_salary csts
-        LEFT JOIN course_schedule cs ON csts.course_schedule_id_=cs.id_
-        LEFT JOIN sys_user su ON csts.user_id_ = su.id_
-        LEFT JOIN class_group cg ON cs.class_group_id_ = cg.id_
-        LEFT JOIN school s ON cs.schoole_id_ = s.id_
-        LEFT JOIN teacher_attendance ta ON cs.id_=ta.course_schedule_id_ AND ta.teacher_id_=#{teacherId}
+            course_schedule_teacher_salary csts
+            LEFT JOIN course_schedule cs ON csts.course_schedule_id_=cs.id_
+            LEFT JOIN sys_user su ON csts.user_id_ = su.id_
+            LEFT JOIN class_group cg ON cs.class_group_id_ = cg.id_
+            LEFT JOIN school s ON cs.schoole_id_ = s.id_
+            LEFT JOIN teacher_attendance ta ON cs.id_=ta.course_schedule_id_ AND ta.teacher_id_=#{teacherId}
         WHERE
         cs.class_date_ = DATE_FORMAT(#{classDate},'%Y%m%d')
         <if test="type!=null and type!=''">
@@ -1427,7 +1427,7 @@
         DELETE
         FROM
             course_schedule_student_payment
-        WHERE user_id_ =#{userId}  AND course_scheduel_id_ IN
+        WHERE user_id_ =#{userId}  AND course_schedule_id_ IN
         <foreach collection="courseScheduleIds" item="courseScheduleId" open="(" close=")" separator=",">
             #{courseScheduleId}
         </foreach>