Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/core/handler/BaseAuthenticationSuccessEventHandler.java

@@ -65,8 +65,8 @@ public class BaseAuthenticationSuccessEventHandler extends SavedRequestAwareAuth
 	@Autowired
 	private ClientDetailsService clientDetailsService;
 
-	@Value("${message.lesseeOrganId}")
-	private Integer lesseeOrganId;
+//	@Value("${message.lesseeOrganId}")
+//	private Integer lesseeOrganId;
 
 	@Autowired
 	private AuthorizationServerTokenServices defaultAuthorizationServerTokenServices;

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/SysUserServiceImpl.java

@@ -44,7 +44,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 
 	@Value("${message.autoRegister}")
 	private boolean autoRegister;
-	@Value("${message.lesseeOrganId}")
+	@Value("${auth.sysconfig.tenantId}")
 	private Integer lesseeOrganId;
 
 	@Override

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

@@ -674,9 +674,15 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 e.setStudentNames(practiceStuNames.get(e.getPracticeId()));
                 e.setPracticeRenewUrl(practiceRenewUrlConfig.getParanValue() + e.getPracticeId());
                 if(reportMap.containsKey(e.getClassGroupId())){
+                    List<CourseScheduleEvaluate> classGroupCourseScheduleEvaluates = reportMap.get(e.getClassGroupId());
+                    CourseScheduleEvaluate courseScheduleEvaluate = classGroupCourseScheduleEvaluates.get(classGroupCourseScheduleEvaluates.size() - 1);
                     e.setHasReport(true);
                     String baseUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
-                    e.setStudyReportUrl(baseUrl + "/#/reportDetail?classGroupId=" + e.getClassGroupId());
+                    if(courseScheduleEvaluate.getVersion().equals(1)){
+                        e.setStudyReportUrl(baseUrl + "/#/reportDetail?classGroupId=" + e.getClassGroupId());
+                    }else if(courseScheduleEvaluate.getVersion().equals(2)){
+                        e.setStudyReportUrl(baseUrl + "/#/reportDetailNew?classGroupId=" + e.getClassGroupId());
+                    }
                 }
             }
             if (ClassGroupTypeEnum.VIP == e.getType()) {

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

@@ -88,7 +88,7 @@
         FROM course_schedule_evaluate cse
                  LEFT JOIN practice_group pg ON pg.id_ = cse.music_group_id_
                  LEFT JOIN subject s on s.id_ = pg.subject_id_
-        WHERE cse.class_group_id_ = #{classGroupId} AND status_=1
+        WHERE cse.class_group_id_ = #{classGroupId} AND status_=1 AND version_=1
         ORDER BY create_time_ DESC
         LIMIT 1
     </select>

mec-teacher/src/main/java/com/ym/mec/teacher/controller/StudyReportController.java

@@ -47,10 +47,11 @@ public class StudyReportController extends BaseController {
         for (CourseScheduleEvaluate courseScheduleEvaluate : courseScheduleEvaluates) {
             courseScheduleEvaluate.setTimes(2);
             courseScheduleEvaluate.setTotalMinutes(100);
-            if (courseScheduleEvaluate.getStatus().equals(1)) {
+            courseScheduleEvaluate.setReportLink(teacherBaseUrl + "/#/studyReportNew?id=" + courseScheduleEvaluate.getId() + "&classGroupId=" + courseScheduleEvaluate.getClassGroupId());
+            if (courseScheduleEvaluate.getStatus().equals(1) && courseScheduleEvaluate.getVersion().equals(2)) {
                 courseScheduleEvaluate.setReportLink(teacherBaseUrl + "/#/reportDetailNew?id=" + courseScheduleEvaluate.getId() + "&classGroupId=" + courseScheduleEvaluate.getClassGroupId());
-            } else {
-                courseScheduleEvaluate.setReportLink(teacherBaseUrl + "/#/studyReportNew?id=" + courseScheduleEvaluate.getId() + "&classGroupId=" + courseScheduleEvaluate.getClassGroupId());
+            } else if ((courseScheduleEvaluate.getStatus().equals(1) && courseScheduleEvaluate.getVersion().equals(1))){
+                courseScheduleEvaluate.setReportLink(teacherBaseUrl + "/#/reportDetail?classGroupId=" + courseScheduleEvaluate.getClassGroupId());
             }
         }
         return succeed(courseScheduleEvaluates);