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

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

@@ -673,8 +673,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             if(ClassGroupTypeEnum.PRACTICE == e.getType()){
                 e.setStudentNames(practiceStuNames.get(e.getPracticeId()));
                 e.setPracticeRenewUrl(practiceRenewUrlConfig.getParanValue() + e.getPracticeId());
-                if(reportMap.containsKey(e.getClassGroupId())){
-                    //e.setHasReport(true);
+                if(reportMap.containsKey(e.getClassGroupId()) && (new Date()).compareTo(DateUtil.stringToDate("2020-03-01 12:18:00"))>=0){
+                    e.setHasReport(true);
                     String baseUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
                     e.setStudyReportUrl(baseUrl + "/#/reportDetail?classGroupId=" + e.getClassGroupId());
                 }

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

@@ -2199,9 +2199,9 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             throw new BizException("未找到用户分部属性");
         }
 
-        if (sysUser.getOrganId().equals(DALIAN_ORGAN_ID)) {
-            sysUser.setOrganId(SHENYANG_ORGAN_ID);
-        }
+//        if (sysUser.getOrganId().equals(DALIAN_ORGAN_ID)) {
+//            sysUser.setOrganId(SHENYANG_ORGAN_ID);
+//        }
 
         List<Integer> includeTeacherIds = new ArrayList<>();
         List<ExtendTeacherBasicDto> organAndSubjectTeachers = teacherDao.findTeaTeachersByOrganAndSubject2(sysUser.getOrganId(), subjectId);
@@ -2224,6 +2224,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                     }
                 }
             }
+
             List<CourseSchedule> vipCourses = courseTypeCourseMap.get(CourseSchedule.CourseScheduleType.VIP);
             if (!CollectionUtils.isEmpty(vipCourses)) {
                 for (CourseSchedule vipCourse : vipCourses) {
@@ -3389,24 +3390,32 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             throw new BizException("请指定推送类型：JIGUANG、SMS、ALL");
         }
 
-        String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
-
         List<CourseScheduleEvaluate> reports = courseScheduleEvaluateDao.findExpiredDateBeforeReport(expiredDate);
 
+        if(CollectionUtils.isEmpty(reports)){
+            return;
+        }
+
+        String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
+
         for (CourseScheduleEvaluate report : reports) {
             PracticeGroup userFreePracticeGroup = practiceGroupDao.get(Long.valueOf(report.getMusicGroupId()));
+            if(Objects.isNull(userFreePracticeGroup)){
+                continue;
+            }
             ClassGroup classGroup = classGroupDao.findByMusicGroupAndType(userFreePracticeGroup.getId().toString(), GroupType.PRACTICE.getCode());
 
             CourseScheduleEvaluate courseScheduleEvaluate = courseScheduleEvaluateDao.findByClassGroupId(classGroup.getId());
             if(Objects.isNull(courseScheduleEvaluate)){
-                throw new BizException("未生成课程报告");
+                continue;
             }
 
             String pushUrl = baseApiUrl + "/#/reportDetail?classGroupId=" + classGroup.getId();
 
             String smsUrl = baseApiUrl + "/#/transfer?url=http://mstudev.dayaedu.com&hash=reportDetail&classGroupId=" + classGroup.getId();
 
-            SysUser student = sysUserFeignService.queryUserById(userFreePracticeGroup.getStudentId());
+//            SysUser student = sysUserFeignService.queryUserById(userFreePracticeGroup.getStudentId());
+            SysUser student = teacherDao.getUser(userFreePracticeGroup.getStudentId());
 
             if(pushType.equals("ALL")||pushType.equals("JIGUANG")){
                 Map<Integer, String> userMap = new HashMap<>();

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

@@ -1266,7 +1266,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
 		//将学生加入到班级，更新班级报名状态及人数信息
 		if(!isOk){
-			if(CollectionUtils.isEmpty(statusOrdersMap.get(DealStatusEnum.ING))){
+			if(CollectionUtils.isEmpty(statusOrdersMap.get(DealStatusEnum.ING))||(!CollectionUtils.isEmpty(statusOrdersMap.get(DealStatusEnum.ING))&&statusOrdersMap.get(DealStatusEnum.ING).size()<=1)){
 				updateVipGroupStudentNumAndStatus(vipGroupId,classGroup,-1,false);
 				classGroupStudentMapperDao.deleteStudentByMusicGroupId(vipGroupId.toString(),userId);
 			}

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

@@ -105,7 +105,7 @@
     </select>
     <select id="findExpiredDateBeforeReport" resultMap="CourseScheduleEvaluate">
       SELECT * FROM course_schedule_evaluate
-      WHERE DATE_FORMATE(create_time_, '%Y-%m-%d') &lt;= DATE_FORMATE(#{expiredDate}, '%Y-%m-%d')
+      WHERE create_time_ &lt;= #{expiredDate}
       AND (is_pushed_ = 0 OR is_pushed_ IS NULL)
     </select>
 </mapper>

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

@@ -1105,7 +1105,7 @@
     <update id="updateCourseSchoolByGroup">
         UPDATE course_schedule cs SET cs.schoole_id_ = #{schoolId},update_time_ = NOW()
         WHERE cs.music_group_id_ = #{groupId}
-        AND cs.group_type_ = #{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler} AND NOW() &lt; CONCAT(cs.class_date_," ",cs.start_class_time_);
+        AND cs.group_type_ = #{groupType} AND NOW() &lt; CONCAT(cs.class_date_," ",cs.start_class_time_);
     </update>
 
     <update id="updateGroupCourseLock">