Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into master_saas

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentCourseScheduleRecordDto.java

@@ -61,6 +61,17 @@ public class StudentCourseScheduleRecordDto {
     @ApiModelProperty(value = "教学点")
     private String teachingAddress;
 
+    @ApiModelProperty(value = "是否达标1是0否")
+    private Integer qualifiedFlag = 0;
+
+    public Integer getQualifiedFlag() {
+        return qualifiedFlag;
+    }
+
+    public void setQualifiedFlag(Integer qualifiedFlag) {
+        this.qualifiedFlag = qualifiedFlag;
+    }
+
     public String getHeadUrl() {
         return headUrl;
     }

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

@@ -2147,12 +2147,12 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 								backTeachingTeacherIdList.addAll(integerAndIntegerListDto.getIds());
 							}
 						}
-                        if (CollectionUtils.isEmpty(backTeachingTeacherIdList)) {
-                            IntegerAndIntegerListDto integerAndIntegerListDto = classGroupTeachingTeacherMap.get(backCourseSchedule.getClassGroupId().longValue());
-                            if (Objects.nonNull(integerAndIntegerListDto)) {
-//								backTeachingTeacherIdList.addAll(integerAndIntegerListDto.getIds());
-                            }
-                        }
+//                        if (CollectionUtils.isEmpty(backTeachingTeacherIdList)) {
+//                            IntegerAndIntegerListDto integerAndIntegerListDto = classGroupTeachingTeacherMap.get(backCourseSchedule.getClassGroupId().longValue());
+//                            if (Objects.nonNull(integerAndIntegerListDto)) {
+////								backTeachingTeacherIdList.addAll(integerAndIntegerListDto.getIds());
+//                            }
+//                        }
 
 						preTeachingTeacherIdList.add(preCourseSchedule.getActualTeacherId());
 						backTeachingTeacherIdList.add(backCourseSchedule.getActualTeacherId());

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

@@ -180,7 +180,11 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 		StatDto result = new StatDto();
 		MusicCompareRankingDto head = new MusicCompareRankingDto();
 		head.setUserId(queryInfo.getUserId());
-		List<MusicCompareRankingDto> userTrainStat = sysMusicCompareWeekDataDao.getUserTrainStat(queryInfo.getStartTime(), queryInfo.getOrderType(), Objects.isNull(queryInfo.getHeardLevel())?null:queryInfo.getHeardLevel().getCode(),queryInfo.getTeacherId(), queryInfo.getTenantId());
+		List<MusicCompareRankingDto> userTrainStat = sysMusicCompareWeekDataDao.getUserTrainStat(queryInfo.getStartTime(),
+				queryInfo.getOrderType(),
+				Objects.isNull(queryInfo.getHeardLevel())?null:queryInfo.getHeardLevel().getCode(),
+				queryInfo.getOrganId(),
+				queryInfo.getTenantId());
 		List<MusicCompareRankingDto> detail = new ArrayList<>();
 
 		List<Integer> studentIds = userTrainStat.stream().limit(10).map(MusicCompareRankingDto::getUserId).collect(Collectors.toList());

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

@@ -109,6 +109,7 @@
         <result column="rest_of_class_" property="restOfClass"/>
         <result column="class_group_id_" property="classGroupId"/>
         <result column="school_name_" property="teachingAddress" />
+        <result column="qualified_flag_" property="qualifiedFlag" />
     </resultMap>
 
     <resultMap type="com.ym.mec.biz.dal.dto.StudentCourseInfoDto" id="StudentCourseInfoDto">
@@ -1113,7 +1114,8 @@
         CONCAT(cs.class_date_,' ',cs.end_class_time_) end_class_time_,
         cs.actual_teacher_id_ teacher_id_,
         cs.teach_mode_,
-        s.name_ school_name_
+        s.name_ school_name_,
+        sa.qualified_flag_
         FROM course_schedule_student_payment cssp
         LEFT JOIN student_attendance sa ON cssp.course_schedule_id_ = sa.course_schedule_id_ AND cssp.user_id_ =
         sa.user_id_

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

@@ -1046,12 +1046,15 @@
 		GROUP BY cssp.`user_id_` ,vg.`vip_group_category_id_`
 		) a LEFT JOIN
 		(
-		SELECT cssp.`user_id_` ,cs.`actual_teacher_id_`,tu.`real_name_` vip_teacher_name_,vg.`educational_teacher_id_` ,edu.`real_name_` edu_teacher_name_,vg.`vip_group_category_id_`     FROM `course_schedule_student_payment` cssp LEFT JOIN `course_schedule` cs on cssp.`course_schedule_id_` = cs.`id_`
+		SELECT cssp.`user_id_` ,cs.`actual_teacher_id_`,tu.`real_name_` vip_teacher_name_,vg.`educational_teacher_id_` ,edu.`real_name_` edu_teacher_name_,vg.`vip_group_category_id_`
+		FROM `course_schedule_student_payment` cssp LEFT JOIN `course_schedule` cs on cssp.`course_schedule_id_` = cs.`id_`
 		LEFT JOIN `sys_user` tu on tu.`id_` = cs.`actual_teacher_id_`
 		LEFT JOIN `vip_group` vg on vg.`id_` = cssp.`music_group_id_`
 		LEFT JOIN `sys_user` edu on edu.`id_` = vg.`educational_teacher_id_`
-		WHERE cs.`status_` = 'OVER' AND cssp.`group_type_` = 'VIP'
-		GROUP BY cssp.`user_id_`,vg.`vip_group_category_id_`
+		WHERE cs.`id_`   in
+		(SELECT max(cs.`id_`)  FROM `course_schedule_student_payment` cssp LEFT JOIN `course_schedule` cs on cssp.`course_schedule_id_` = cs.`id_`
+		LEFT JOIN `vip_group` vg on vg.`id_` = cssp.`music_group_id_`
+		WHERE cs.`status_` = 'OVER' AND cssp.`group_type_` = 'VIP' GROUP BY cssp.`user_id_`,vg.`vip_group_category_id_` )
 		) b on a.id_ = b.user_id_ and a.vip_group_category_id_ = b.vip_group_category_id_
 		LEFT JOIN
 		(