Merge branch 'groupNickName' of http://git.dayaedu.com/yonge/mec into test

 Conflicts:

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

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupPaymentCalenderDao.java

@@ -321,7 +321,7 @@ public interface MusicGroupPaymentCalenderDao extends BaseDAO<Long, MusicGroupPa
      * @param musicGroupId
      * @return
      */
-    List<Integer> getMusicGroupCalenderBatchNoTimes(@Param("musicGroupId") String musicGroupId);
+    List<MusicGroupPaymentCalender> getMusicGroupCalenderBatchNoTimes(@Param("musicGroupId") String musicGroupId);
 
     /**
      * 获取多乐团的报名缴费项

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

@@ -503,6 +503,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			if(!GroupStatusEnum.NORMAL.equals(practiceGroup.getGroupStatus())){
 				throw new BizException("非进行中网管课不支持加课");
 			}
+			groupEndDate = practiceGroup.getCoursesExpireDate();
 			organId=practiceGroup.getOrganId();
 
 			List<TeacherDefaultPracticeGroupSalary> teacherDefaultPracticeGroupSalaryList = teacherDefaultPracticeGroupSalaryDao
@@ -639,7 +640,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 					}
 					if (groupEndDate != null) {
 						if (calendar.getTime().after(groupEndDate)) {
-							throw new BizException("排课时间超出排课截止日期（{}）", groupEndDate);
+							throw new BizException("排课时间超出排课截止日期（{}）", DateUtil.dateToString(groupEndDate, DateUtil.DATE_FORMAT_MIN));
 						}
 					}
 

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

@@ -1491,13 +1491,15 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             throw new BizException("乐团找不到");
         }
 
-        if (musicGroup.getStatus() != MusicGroupStatusEnum.PAY) {
+        if (!(musicGroup.getStatus() == MusicGroupStatusEnum.PAY ||
+                musicGroup.getStatus() == MusicGroupStatusEnum.PREPARE ||
+                musicGroup.getStatus() == MusicGroupStatusEnum.PROGRESS)) {
             throw new BizException("乐团当前状态是[{}]，不能延长缴费", musicGroup.getStatus().getMsg());
         }
 
         Date date = new Date();
 
-        if (expireDate.before(date)) {
+        if (DateUtil.getLastTimeWithDay(expireDate).before(date)) {
             throw new BizException("日期设置错误");
         }
 
@@ -1535,13 +1537,16 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             throw new BizException("乐团找不到");
         }
 
-        if (!(musicGroup.getStatus() == MusicGroupStatusEnum.APPLY || musicGroup.getStatus() == MusicGroupStatusEnum.PAY)) {
+        if (!(musicGroup.getStatus() == MusicGroupStatusEnum.APPLY ||
+                musicGroup.getStatus() == MusicGroupStatusEnum.PAY ||
+                musicGroup.getStatus() == MusicGroupStatusEnum.PREPARE ||
+                musicGroup.getStatus() == MusicGroupStatusEnum.PROGRESS)) {
             throw new BizException("乐团当前状态是[{}]，不能延长报名", musicGroup.getStatus().getMsg());
         }
 
         Date date = new Date();
 
-        if (date.after(expireDate)) {
+        if (date.after(DateUtil.getLastTimeWithDay(expireDate))) {
             throw new BizException("日期设置错误");
         }
 
@@ -1569,7 +1574,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 
         Date date = new Date();
 
-        if (date.after(expireDate)) {
+        if (date.after(DateUtil.getLastTimeWithDay(expireDate))) {
             throw new BizException("日期设置错误");
         }
 

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

@@ -618,7 +618,6 @@ public class StudentManageServiceImpl implements StudentManageService {
                 student.setUserType(sysUser.getUserType() + ",STUDENT");
                 student.setUpdateTime(date);
                 sysUserFeignService.updateSysUser(student);
-
             }
         } else {
             student.setUpdateTime(date);

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

@@ -161,14 +161,14 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         Map<String, Object> params = new HashMap<>();
         MapUtil.populateMap(params, queryInfo);
 
-        List<StudentApplyDetailDto> dataList = null;
+        List<StudentApplyDetailDto> dataList =  new ArrayList<>();
         int count = studentRegistrationDao.queryStudentDetailCount(params);
         if (queryInfo.getIsExport() && count > 50000) {
             throw new BizException("数据集太大，不能导出.最大数据集不能超过50000");
         }
-        if (count > 0) {
-            pageInfo.setTotal(count);
-            params.put("offset", pageInfo.getOffset());
+        pageInfo.setTotal(count);
+        params.put("offset", pageInfo.getOffset());
+        if (queryInfo.getPage() <= pageInfo.getTotalPage()) {
             dataList = studentRegistrationDao.queryStudentDetailPage(params);
             Set<Integer> subjectIds = dataList.stream().map(e -> e.getActualSubjectId()).collect(Collectors.toSet());
             Map<Integer, String> subjectMap = MapUtil.convertIntegerMap(musicGroupSubjectPlanDao.findSubjectMap(subjectIds, queryInfo.getMusicGroupId()));
@@ -183,9 +183,6 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 }
             });
         }
-        if (count == 0) {
-            dataList = new ArrayList<>();
-        }
         pageInfo.setRows(dataList);
         return pageInfo;
     }
@@ -331,26 +328,8 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         studentRegistration.setUpdateTime(date);
         studentRegistration.setUserId(sysUser.getId());
         studentRegistration.setMusicGroupStatus(StudentMusicGroupStatusEnum.APPLY);
-
-        Organization organization = organizationDao.get(studentRegistration.getOrganId());
-        if(organization.getGradeType().equals(GradeTypeEnum.SIX_PLUS)){
-            for (SixPlusGradeEnum value : SixPlusGradeEnum.values()) {
-                if(value.getCode().equals(studentRegistration.getCurrentGradeNum())){
-                    studentRegistration.setCurrentGrade(value.getDesc());
-                    break;
-                }
-            }
-        }else {
-            for (FivePlusGradeEnum value : FivePlusGradeEnum.values()) {
-                if(value.getCode().equals(studentRegistration.getCurrentGradeNum())){
-                    studentRegistration.setCurrentGrade(value.getDesc());
-                    break;
-                }
-            }
-        }
-
-        if(hasReg != null){
-            studentRegistration.setMusicGroupStatus(StudentMusicGroupStatusEnum.NORMAL);
+        if (hasReg != null) {
+            studentRegistration.setMusicGroupStatus(StudentMusicGroupStatusEnum.APPLY);
             studentRegistration.setId(hasReg.getId());
             studentRegistrationDao.update(studentRegistration);
         } else {
@@ -1641,34 +1620,35 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
     @Override
     public String checkRegOrPayStatus(String musicGroupId) {
         MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
-        if (musicGroup.getStatus() == MusicGroupStatusEnum.PAY &&
-                musicGroup.getStatus() == MusicGroupStatusEnum.PREPARE &&
+        if (musicGroup.getStatus() == MusicGroupStatusEnum.PAY ||
+                musicGroup.getStatus() == MusicGroupStatusEnum.PREPARE ||
                 musicGroup.getStatus() == MusicGroupStatusEnum.PROGRESS) {
             Date now = new Date();
             MusicGroupPaymentCalender regCalender = musicGroupPaymentCalenderDao.findByMusicGroupRegCalender(musicGroup.getId());
             if (regCalender != null && regCalender.getDeadlinePaymentDate() != null) {
                 musicGroup.setPaymentExpireDate(regCalender.getDeadlinePaymentDate());
             }
-            if (musicGroup.getPaymentExpireDate() != null && DateUtil.daysBetween(musicGroup.getPaymentExpireDate(), now) > 1) {
+
+            if (musicGroup.getPaymentExpireDate() != null && now.compareTo(DateUtil.getLastTimeWithDay(musicGroup.getPaymentExpireDate())) > 0) {
                 return "乐团缴费时间已截止";
             }
         }
         //储备中、进行中，乐团没有报名缴费项、有多批次缴费项不能缴费、有已上的课程不能缴费
-        if (musicGroup.getStatus() == MusicGroupStatusEnum.PREPARE &&
+        if (musicGroup.getStatus() == MusicGroupStatusEnum.PREPARE ||
                 musicGroup.getStatus() == MusicGroupStatusEnum.PROGRESS) {
             MusicGroupPaymentCalender regCalender = musicGroupPaymentCalenderDao.findByMusicGroupRegCalender(musicGroup.getId());
             if (regCalender == null) {
                 return "乐团没有报名缴费项";
             }
-            List<Integer> musicGroupCalenderBatchNoTimes = musicGroupPaymentCalenderDao.getMusicGroupCalenderBatchNoTimes(musicGroup.getId());
+            List<MusicGroupPaymentCalender> musicGroupCalenderBatchNoTimes = musicGroupPaymentCalenderDao.getMusicGroupCalenderBatchNoTimes(musicGroup.getId());
             if (musicGroupCalenderBatchNoTimes.size() > 1) {
-                return "乐团已建多批次缴费";
+                return "乐团已进入续费阶段";
             }
 
-            Integer hasStartCourseNum = courseScheduleDao.getMusicGroupHasStartCourseNum(musicGroup.getId());
-            if (hasStartCourseNum != null && hasStartCourseNum > 0) {
-                return "乐团已开课";
-            }
+//            Integer hasStartCourseNum = courseScheduleDao.getMusicGroupHasStartCourseNum(musicGroup.getId());
+//            if (hasStartCourseNum != null && hasStartCourseNum > 0) {
+//                return "乐团已开课";
+//            }
         }
         return null;
     }
@@ -1678,21 +1658,21 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         Map<String, Boolean> viewMap = new HashMap<>();
         List<MusicGroupPaymentCalender> regCalenders = musicGroupPaymentCalenderDao.getMusicGroupRegCalenderByIds(ids);
         for (MusicGroupPaymentCalender regCalender : regCalenders) {
-            viewMap.put(regCalender.getMusicGroupId(),true);
+            viewMap.put(regCalender.getMusicGroupId(), true);
         }
 
         Map<String, List<MusicGroupPaymentCalender>> musicGroupBatchNoTimes = musicGroupPaymentCalenderDao.getMusicGroupCalenderBatchNoByIds(ids).stream().collect(Collectors.groupingBy(MusicGroupPaymentCalender::getMusicGroupId));
-        musicGroupBatchNoTimes.forEach((musicGroupId,calenders)->{
-            if(viewMap.containsKey(musicGroupId) && calenders.size() > 1){
+        musicGroupBatchNoTimes.forEach((musicGroupId, calenders) -> {
+            if (viewMap.containsKey(musicGroupId) && calenders.size() > 1) {
                 viewMap.remove(musicGroupId);
             }
         });
-        List<CourseSchedule> musicGroupsHasStartCourseNums = courseScheduleDao.getMusicGroupsHasStartCourseNum(ids);
-        for (CourseSchedule musicGroupsHasStartCourseNum : musicGroupsHasStartCourseNums) {
-            if(viewMap.containsKey(musicGroupsHasStartCourseNum.getMusicGroupId())){
-                viewMap.remove(musicGroupsHasStartCourseNum.getMusicGroupId());
-            }
-        }
+//        List<CourseSchedule> musicGroupsHasStartCourseNums = courseScheduleDao.getMusicGroupsHasStartCourseNum(ids);
+//        for (CourseSchedule musicGroupsHasStartCourseNum : musicGroupsHasStartCourseNums) {
+//            if(viewMap.containsKey(musicGroupsHasStartCourseNum.getMusicGroupId())){
+//                viewMap.remove(musicGroupsHasStartCourseNum.getMusicGroupId());
+//            }
+//        }
         return viewMap;
     }
 }

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

@@ -577,8 +577,8 @@
         </foreach>
     </select>
 
-    <select id="getMusicGroupCalenderBatchNoTimes" resultType="java.lang.Integer">
-        SELECT COUNT(*) FROM music_group_payment_calender
+    <select id="getMusicGroupCalenderBatchNoTimes" resultMap="MusicGroupPaymentCalender">
+        SELECT batch_no_, COUNT(*) expect_num_ FROM music_group_payment_calender
         WHERE music_group_id_ = #{musicGroupId}
         AND status_ IN ('AUDITING','NO', 'OPEN', 'OVER', 'PAID')
         GROUP BY batch_no_
@@ -589,16 +589,17 @@
         <foreach collection="ids" item="id" open="(" close=")" separator=",">
             #{id}
         </foreach>
-        AND payment_type_='MUSIC_APPLY'
+        AND payment_type_='MUSIC_APPLY' AND batch_no_ IS NOT NULL
     </select>
 
     <select id="getMusicGroupCalenderBatchNoByIds" resultMap="MusicGroupPaymentCalender">
-        SELECT music_group_id_, COUNT(*) expect_num_ FROM music_group_payment_calender
+        SELECT music_group_id_,batch_no_, COUNT(*) expect_num_ FROM music_group_payment_calender
         WHERE music_group_id_ IN
         <foreach collection="ids" item="id" open="(" close=")" separator=",">
             #{id}
         </foreach>
         AND status_ IN ('AUDITING','NO', 'OPEN', 'OVER', 'PAID')
-        GROUP BY batch_no_
+        AND batch_no_ IS NOT NULL
+        GROUP BY music_group_id_,batch_no_
     </select>
 </mapper>

mec-student/src/main/java/com/ym/mec/student/controller/MusicGroupController.java

@@ -282,7 +282,7 @@ public class MusicGroupController extends BaseController {
 
         String err = studentRegistrationService.checkRegOrPayStatus(studentRegistration.getMusicGroupId());
         if(err !=null){
-            return failed(err+"不能缴费");
+            return failed(err+"不可缴费，请联系教务老师");
         }
 
         Integer userId = studentRegistration.getUserId();
@@ -315,7 +315,7 @@ public class MusicGroupController extends BaseController {
 
         String err = studentRegistrationService.checkRegOrPayStatus(studentRegistration.getMusicGroupId());
         if(err !=null){
-            return failed(err+"不能缴费");
+            return failed(err+"不可缴费，请联系教务老师");
         }
         Integer userId = studentRegistration.getUserId();
         StudentPaymentOrder ApplyOrder = studentPaymentOrderService.findMusicGroupApplyOrderByStatus(userId, studentRegistration.getMusicGroupId(), DealStatusEnum.SUCCESS);

mec-student/src/main/java/com/ym/mec/student/controller/MusicGroupRegisterController.java

@@ -65,7 +65,7 @@ public class MusicGroupRegisterController extends BaseController {
             return failed("乐团信息不存在");
         }
 
-        if (DateUtil.daysBetween(musicGroup.getApplyExpireDate(), date) > 1 && studentRegistration.getId() == null) {
+        if (date.compareTo(DateUtil.getLastTimeWithDay(musicGroup.getApplyExpireDate())) > 0 && studentRegistration.getId() == null) {
             return failed("乐团已截止报名");
         }
 
@@ -77,12 +77,18 @@ public class MusicGroupRegisterController extends BaseController {
         if (hasReg != null && hasReg.getMusicGroupStatus() != StudentMusicGroupStatusEnum.QUIT) {
             return succeed(hasReg);
         }
+        if (hasReg != null && hasReg.getMusicGroupStatus() == StudentMusicGroupStatusEnum.QUIT) {
+            return failed( "无法重复报名，请联系教务老师");
+        }
         String err = studentRegistrationService.checkRegOrPayStatus(musicGroup.getId());
-        if(err != null){
-            return failed(err+",不能报名");
+        if (err != null) {
+            return failed(err + "不可报名，请联系教务老师");
         }
 
-        if (musicGroup.getStatus().equals(MusicGroupStatusEnum.PAY)) {
+        if (musicGroup.getStatus().equals(MusicGroupStatusEnum.PAY) ||
+                musicGroup.getStatus().equals(MusicGroupStatusEnum.PREPARE) ||
+                musicGroup.getStatus().equals(MusicGroupStatusEnum.PROGRESS)
+        ) {
             studentRegistration.setPaymentStatus(PaymentStatusEnum.OPEN);
         } else {
             studentRegistration.setPaymentStatus(PaymentStatusEnum.NO);