Browse Source

1、服务指标;
2、增加课外训练待布置学员列表;
3、网管课续费提醒;

Joburgess 5 years ago
parent
commit
b38e68c3de

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

@@ -147,10 +147,10 @@ public class StudentServeServiceImpl implements StudentServeService {
                     int exercisesMessageNum=0;
                     int exercisesMessageTimelyNum=0;
                     for (StudentServeCourseHomeworkDto studentHomework : studentHomeworks) {
-                        if(!new Integer(1).equals(studentHomework.getStatus())){
+                        if(!YesOrNoEnum.YES.equals(studentHomework.getStatus())){
                             continue;
                         }
-                        if(!new Integer(1).equals(studentHomework.getIsReplied())){
+                        if(!YesOrNoEnum.YES.equals(studentHomework.getIsReplied())){
                             continue;
                         }
                         exercisesMessageNum+=1;
@@ -185,10 +185,10 @@ public class StudentServeServiceImpl implements StudentServeService {
                 int exercisesMessageNum=0;
                 int exercisesMessageTimelyNum=0;
                 for (ExtracurricularExercisesReply studentHomework : studentExercises) {
-                    if(!new Integer(1).equals(studentHomework.getStatus())){
+                    if(!YesOrNoEnum.YES.equals(studentHomework.getStatus())){
                         continue;
                     }
-                    if(!new Integer(1).equals(studentHomework.getIsReplied())){
+                    if(!YesOrNoEnum.YES.equals(studentHomework.getIsReplied())){
                         continue;
                     }
                     exercisesMessageNum+=1;

+ 2 - 2
mec-biz/src/main/resources/config/mybatis/ExtracurricularExercisesReplyMapper.xml

@@ -436,7 +436,7 @@
 			cs.actual_teacher_id_,
 			tea.real_name_ teacher_name_,
 			cs.music_group_id_ group_id_,
-			cs.group_type_ group_type,
+			cs.group_type_,
 			cs.name_ group_name_,
 			CONCAT(cs.class_date_, ' ', cs.start_class_time_) course_start_time_,
 			CONCAT(cs.class_date_, ' ', cs.end_class_time_) course_end_time_,
@@ -453,7 +453,7 @@
 		LEFT JOIN course_schedule cs ON cs.id_=ch.course_schedule_id_
 		LEFT JOIN sys_user tea ON cs.actual_teacher_id_=tea.id_
 		WHERE
-			sch.user_id_=#{studentId} AND DATE_FORMAT( sch.create_time_, '%Y-%m-%d' ) BETWEEN #{monday} AND #{sunday})
+			sch.user_id_=#{studentId} AND cs.class_date_ BETWEEN #{monday} AND #{sunday})
 		ORDER BY homework_create_time_ DESC
 		<include refid="global.limit"/>
 	</select>