Merge branch 'feature/0427-school' of http://git.dayaedu.com/yonge/mec into feature/0427-school

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/MessageTypeEnum.java

@@ -265,6 +265,8 @@ public enum MessageTypeEnum implements BaseEnum<String, MessageTypeEnum> {
     JIGUANG_STUDENT_QUIT_GROUP_APPLY("JIGUANG_STUDENT_QUIT_GROUP_APPLY","学员退团申请消息-极光推送"),
     // 学员退团消息
     JIGUANG_STUDENT_QUIT_GROUP("JIGUANG_STUDENT_QUIT_GROUP","学员退团消息-极光推送"),
+    // 学员退团消息
+    JIGUANG_STUDENT_QUIT_GROUP_DENIED("JIGUANG_STUDENT_QUIT_GROUP_DENIED","学员退团消息-极光推送"),
 
     // 学员请假消息
     JIGUANG_STUDENT_LEAVE("JIGUANG_STUDENT_LEAVE","学员请假消息-极光推送"),

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

@@ -2,6 +2,7 @@ package com.ym.mec.biz.service.impl;
 
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.SimpleUserDto;
+import com.ym.mec.biz.dal.entity.ApprovalStatus;
 import com.ym.mec.biz.dal.entity.MusicGroupQuit;
 import com.ym.mec.biz.dal.entity.StudentRegistration;
 import com.ym.mec.biz.dal.entity.Subject;
@@ -113,6 +114,7 @@ public class MusicGroupQuitServiceImpl extends BaseServiceImpl<Long, MusicGroupQ
 		this.schoolAudit(musicGroupQuitId,reason,EQuitGroupAuditStatusEnum.REJECT);
 	}
 
+	@Transactional(rollbackFor = Exception.class)
 	public void schoolAudit(Long musicGroupQuitId,String reason,EQuitGroupAuditStatusEnum status){
 		MusicGroupQuit musicGroupQuit = musicGroupQuitDao.get(musicGroupQuitId);
 		if(Objects.isNull(musicGroupQuit)){
@@ -124,6 +126,9 @@ public class MusicGroupQuitServiceImpl extends BaseServiceImpl<Long, MusicGroupQ
 		Integer userId = sysUserService.getUserId();
 		musicGroupQuit.setAuditSchoolStaff(userId);
 		musicGroupQuit.setSchoolStaffAuditStatus(status);
+		if(status == EQuitGroupAuditStatusEnum.REJECT){
+			musicGroupQuit.setStatus(ApprovalStatus.DENIED);
+		}
 		musicGroupQuit.setSchoolStaffAuditReason(reason);
 		musicGroupQuitDao.update(musicGroupQuit);
 	}

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

@@ -486,7 +486,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 		Boolean freeFlag = calender.getCurrentTotalAmount().compareTo(BigDecimal.ZERO) == 0;
 		List<String> phones = importDtos.stream().map(e -> e.getPhone()).collect(Collectors.toList());
         List<BasicUserDto> userList = teacherDao.queryUserByPhones(phones);
-		List<String> existPhones = studentDao.queryExistStuByPhone(phones);
+//		List<String> existPhones = studentDao.queryExistStuByPhone(phones);
 		Map<String, BasicUserDto> userDtoMap = userList.stream().collect(Collectors.groupingBy(e -> e.getPhone(), Collectors.collectingAndThen(Collectors.toList(), v -> v.get(0))));
 		Organization organization = organizationDao.get(calender.getOrganId());
 		//检查用户是否已入团或在其他机构已注册
@@ -522,6 +522,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 			student = studentDao.get(userId);
 			if(Objects.isNull(student)){
 				student = new Student(userId, subjectMap.get(si.getSubjectName()) + "");
+				student.setCurrentClass(si.getCurrentClass());
 				student.setCurrentGradeNum(SixPlusGradeEnum.get(si.getGrade()).getCode());
 				studentDao.insert(student);
 				// 添加用户现金账户
@@ -2571,8 +2572,6 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             //加一的原因是为了和positionId同步，枚举是从0开始
             musicGroupQuit.setCurrentApproveRole(ORGAN_MANAGER.ordinal() + 1 + "");
         }
-        musicGroupQuitDao.update(musicGroupQuit);
-
         if (status == ApprovalStatus.APPROVED) {
 
             List<Integer> classGroupIdList = classGroupStudentMapperDao.queryClassGroupIdList(musicGroupId, userId, GroupType.MUSIC);
@@ -2764,27 +2763,39 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 sysUserCashAccountLog.setReturnFeeType(ReturnFeeEnum.MUSIC);
                 sysUserCashAccountLog.setComment("退出乐团");
                 sysUserCashAccountLogDao.insert(sysUserCashAccountLog);
-                // 增加交易流水
-//                sysUserCashAccountDetailService.addCashAccountDetail(userId, amount, SysUserCashAccountDetailService.MUSIC_GROUP + musicGroupId, "",
-//                        PlatformCashAccountDetailTypeEnum.REFUNDS, null, SUCCESS, "退出乐团", null);
             }
-        }
+			// 推送退团消息
+			IPage<SchoolStaffWrapper.SchoolStaff> page = schoolStaffService.selectPage(new Page<>(1, -1),
+					SchoolStaffWrapper.SchoolStaffQuery.builder().schoolId(musicGroup.getCooperationOrganId().longValue()).build());
+			List<SchoolStaffWrapper.SchoolStaff> records = page.getRecords();
+			if (CollectionUtils.isNotEmpty(records)) {
 
-        // 推送退团消息
-        IPage<SchoolStaffWrapper.SchoolStaff> page = schoolStaffService.selectPage(new Page<>(1, -1),
-                SchoolStaffWrapper.SchoolStaffQuery.builder().schoolId(musicGroup.getCooperationOrganId().longValue()).build());
-        List<SchoolStaffWrapper.SchoolStaff> records = page.getRecords();
-        if (CollectionUtils.isNotEmpty(records)) {
+				SysUser sysUser = sysUserFeignService.queryUserById(userId);
 
-            SysUser sysUser = sysUserFeignService.queryUserById(userId);
+				Map<Integer, String> userMap = new HashMap<>();
+				records.forEach(o -> userMap.put(o.getUserId().intValue(), o.getUserId().toString()));
 
-            Map<Integer, String> userMap = new HashMap<>();
-            records.forEach(o -> userMap.put(o.getUserId().intValue(), o.getUserId().toString()));
+				sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.JIGUANG_STUDENT_QUIT_GROUP,
+						userMap, null, 0, null,
+						"SCHOOL",musicGroup.getName(),sysUser.getUsername());
+			}
+		}else {
+			IPage<SchoolStaffWrapper.SchoolStaff> page = schoolStaffService.selectPage(new Page<>(1, -1),
+					SchoolStaffWrapper.SchoolStaffQuery.builder().schoolId(musicGroup.getCooperationOrganId().longValue()).build());
+			List<SchoolStaffWrapper.SchoolStaff> records = page.getRecords();
+			if (CollectionUtils.isNotEmpty(records)) {
 
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.JIGUANG_STUDENT_QUIT_GROUP,
-                    userMap, null, 0, null,
-                    "SCHOOL",musicGroup.getName(),sysUser.getUsername());
-        }
+				SysUser sysUser = sysUserFeignService.queryUserById(userId);
+
+				Map<Integer, String> userMap = new HashMap<>();
+				records.forEach(o -> userMap.put(o.getUserId().intValue(), o.getUserId().toString()));
+
+				sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.JIGUANG_STUDENT_QUIT_GROUP_DENIED,
+						userMap, null, 0, null,
+						"SCHOOL",musicGroup.getName(),sysUser.getUsername(),musicGroupQuit.getReason());
+			}
+		}
+		musicGroupQuitDao.update(musicGroupQuit);
         return true;
     }
 

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

@@ -59,7 +59,7 @@ public class SchoolIndexStatServiceImpl implements SchoolIndexStatService {
         //年级分布
         List<SchoolIndexStatWrapper.GradeDistribution> gradeDistributions = studentRegistrations.stream()
                 .map(e -> {
-                    String gradeName = createGradeMap().getOrDefault(e.getCurrentGrade(), "一年级");
+                    String gradeName = gradeMap.getOrDefault(e.getCurrentGrade(), "一年级");
                     e.setCurrentGrade(gradeName);
                     return e;
                 })
@@ -256,15 +256,9 @@ public class SchoolIndexStatServiceImpl implements SchoolIndexStatService {
             "四年级",
             "五年级",
             "六年级",
-            "六年级/初一",
-            "七年级/初一",
-            "初一/七年级",
-            "七年级/初二",
-            "八年级/初二",
-            "初二/八年级",
-            "八年级/初三",
-            "初三/九年级",
-            "九年级/初三",
+            "七年级",
+            "八年级",
+            "九年级",
             "高一",
             "高二",
             "高三"

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

@@ -159,7 +159,7 @@
                 current_grade_num_=#{currentGradeNum},
             </if>
             <if test="currentClass != null">
-                current_class_=#{currentClass},
+                current_class_ = #{currentClass},
             </if>
             <if test="memberRankSettingId != null">
                 member_rank_setting_id_=#{memberRankSettingId},