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

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

@@ -212,7 +212,7 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
      * @param classGroupIds
      * @return
      */
-    List<Map<Integer, Integer>> countTeacherNums(@Param("classGroupIds") String classGroupIds);
+    List<Map<Integer, Long>> countTeacherNums(@Param("classGroupIds") String classGroupIds);
 
     /**
      * @return java.util.List<com.ym.mec.biz.dal.dto.TeacherClassGroupDto>

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentApplyDetailDto.java

@@ -8,6 +8,9 @@ import com.ym.mec.common.page.QueryInfo;
 
 public class StudentApplyDetailDto{
 
+    @ApiModelProperty(value = "学生报名编号",required = false)
+    private Long id;
+
     @ApiModelProperty(value = "学生姓名",required = false)
     private String studentName;
 
@@ -131,4 +134,12 @@ public class StudentApplyDetailDto{
     public void setPaymentStatus(String paymentStatus) {
         this.paymentStatus = paymentStatus;
     }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
 }

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

@@ -186,14 +186,6 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             classGroupIdList.add(classGroup.getId());
         }
 
-        List<ImGroupMember> imGroupMemberList = new ArrayList<>();
-        List<ClassGroupStudentMapper> classGroupStudentMappers = classGroupStudentMapperDao.findByClassGroups(classGroupIdList);
-
-        for (ClassGroupStudentMapper classGroupStudentMapper : classGroupStudentMappers) {
-            if (classGroupStudentMapper.getStatus().equals(ClassGroupStudentStatusEnum.QUIT)) continue;
-            imGroupMemberList.add(new ImGroupMember(classGroupStudentMapper.getUserId().toString()));
-        }
-
         //1、插入班级
         ClassGroup classGroup = new ClassGroup();
         classGroup.setMusicGroupId(musicGroupId);
@@ -206,6 +198,25 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         classGroup.setUpdateTime(date);
         insert(classGroup);
 
+        List<ImGroupMember> imGroupMemberList = new ArrayList<>();
+        List<ClassGroupStudentMapper> mixClassGroupStudentMappers = new ArrayList<>();
+        List<ClassGroupStudentMapper> classGroupStudentMappers = classGroupStudentMapperDao.findByClassGroups(classGroupIdList);
+
+        for (ClassGroupStudentMapper classGroupStudentMapper : classGroupStudentMappers) {
+            ClassGroupStudentMapper mixClassGroupStudentMapper = new ClassGroupStudentMapper();
+            if (classGroupStudentMapper.getStatus().equals(ClassGroupStudentStatusEnum.QUIT)) continue;
+            mixClassGroupStudentMapper.setMusicGroupId(musicGroupId);
+            mixClassGroupStudentMapper.setClassGroupId(classGroup.getId());
+            mixClassGroupStudentMapper.setUserId(classGroupStudentMapper.getUserId());
+            mixClassGroupStudentMapper.setCreateTime(date);
+            mixClassGroupStudentMapper.setStatus(ClassGroupStudentStatusEnum.NORMAL);
+            mixClassGroupStudentMappers.add(mixClassGroupStudentMapper);
+
+            imGroupMemberList.add(new ImGroupMember(classGroupStudentMapper.getUserId().toString()));
+        }
+        //插入学生关联关系
+        classGroupStudentMapperDao.classGroupStudentsInsert(mixClassGroupStudentMappers);
+
         //2、插入班级关联关系
         List<ClassGroupRelation> classGroupRelationList = new ArrayList<>();
         for (ClassGroup cGroup : classGroups) {
@@ -506,11 +517,11 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         if (imGroupModels != null && imGroupModels.size() > 0) {
             Set<String> classGroupIds = imGroupModels.stream().map(e -> e.getId()).collect(Collectors.toSet());
             //获取班级老师总数map
-            List<Map<Integer, Integer>> nums = classGroupDao.countTeacherNums(StringUtils.join(classGroupIds, ","));
-            Map<Integer, Integer> numsMap = MapUtil.convertMybatisMap(nums);
+            List<Map<Integer, Long>> nums = classGroupDao.countTeacherNums(StringUtils.join(classGroupIds, ","));
+            Map<Integer, Long> numsMap = MapUtil.convertMybatisMap(nums);
             imGroupModels.forEach(e -> {
-                Integer num = numsMap.get(e.getId());
-                e.setCount(num == null ? 0 : num + e.getCount());
+                Long num = numsMap.get(Integer.parseInt(e.getId()));
+                e.setCount((int)(num == null ? 0L : num) + e.getCount());
             });
         }
         return imGroupModels;

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

@@ -143,7 +143,8 @@ public class ClassGroupStudentMapperServiceImpl extends BaseServiceImpl<Long, Cl
             classGroupStudentMapper.setStatus(ClassGroupStudentStatusEnum.NORMAL);
             classGroupStudentMappers.add(classGroupStudentMapper);
             if (classGroup.getType().equals(ClassGroupTypeEnum.NORMAL)) {
-                StudentRegistration studentRegistration = studentRegistrationService.get(Long.parseLong(userIdStr));
+                StudentRegistration studentRegistration = studentRegistrationService.queryByUserIdAndMusicGroupId(Integer.parseInt(userIdStr),classGroup.getMusicGroupId());
+                studentRegistration.setClassGroupId(classGroupId);
                 studentRegistrationService.update(studentRegistration);
             }
         }

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

@@ -158,12 +158,11 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 		if(imGroupModels != null && imGroupModels.size() > 0){
 			Set<String> classGroupIds = imGroupModels.stream().map(e -> e.getId()).collect(Collectors.toSet());
 			//获取班级老师总数map
-			List<Map<Integer, Integer>> nums = classGroupDao.countTeacherNums(StringUtils.join(classGroupIds,","));
-			Map<Integer, Integer> numsMap = MapUtil.convertMybatisMap(nums);
+			List<Map<Integer, Long>> nums = classGroupDao.countTeacherNums(StringUtils.join(classGroupIds, ","));
+			Map<Integer, Long> numsMap = MapUtil.convertMybatisMap(nums);
 			imGroupModels.forEach(e -> {
-				//获取当前班级老师总数
-				Integer num = numsMap.get(e.getId());
-				e.setCount(num == null?0:num + e.getCount());
+				Long num = numsMap.get(Integer.parseInt(e.getId()));
+				e.setCount((int)(num == null ? 0L : num) + e.getCount());
 			});
 		}
 		return imGroupModels;

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

@@ -245,9 +245,10 @@
         <result column="payment_status_" property="paymentStatus"/>
         <result column="gender_" property="gender"/>
         <result column="user_id_" property="studentId"/>
+        <result column="id_" property="id"/>
     </resultMap>
     <select id="queryStudentDetailPage" resultMap="studentApplyDetail">
-        SELECT sr.user_id_,sr.name_ username_,sr.parents_name_,sr.current_class_,sr.current_grade_,
+        SELECT sr.id_, sr.user_id_,sr.name_ username_,sr.parents_name_,sr.current_class_,sr.current_grade_,
         su.gender_,sr.is_allow_adjust_, s.name_ subject_name_,ss.name_
         actual_subject_name_,sr.parents_phone_,sr.payment_status_
         FROM student_registration sr
@@ -321,7 +322,7 @@
         student_registration sr on u.id_ = sr.user_id_ where u.id_ = #{userId} order by sr.create_time_ desc limit 0,1
     </select>
 
-    <select id="queryByUserIdAndMusicGroupId" resultMap="StudentRegistration" parameterType="map">
+    <select id="queryByUserIdAndMusicGroupId" resultMap="StudentRegistration">
         select * from student_registration where music_group_id_ = #{musicGroupId} and user_id_ = #{userId}
     </select>
 
@@ -405,21 +406,13 @@
             #{item.remark},now(),now(),#{item.parentsName},#{item.parentsCompany},#{item.paymentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{item.subjectId},#{item.musicGroupStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
         </foreach>
     </insert>
-    <insert id="insertBasic" parameterType="com.ym.mec.biz.dal.entity.StudentRegistration">
-        INSERT INTO student_registration
-        (parents_phone_,user_id_,name_,music_group_id_,current_grade_,current_class_,subject_id_,
-        create_time_,update_time_,parents_name_,payment_status_,actual_subject_id_,music_group_status_)
-        VALUES (#{parentsPhone},#{userId},#{name},#{musicGroupId},#{currentGrade},#{currentClass},#{subjectId},
-            now(),now(),#{parentsName},#{paymentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{subjectId},
-            #{musicGroupStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
-    </insert>
 
     <!-- 查询乐团userIdList的学生 -->
     <select id="findStudentListByUserIdList" resultMap="StudentRegistration">
-        SELECT * FROM student_registration WHERE music_group_id_ = #{musicGroupId} AND FIND_IN_SET(user_id_,#{userIdList})
-    </select>
-    <select id="queryStudentByMusicGroupId" resultMap="StudentRegistration">
-
+        SELECT * FROM student_registration WHERE music_group_id_ = #{musicGroupId} AND user_id_ IN
+        <foreach collection="userIdList" item="userId" index="index" open="(" close=")" separator=",">
+            #{userId}
+        </foreach>
     </select>
 
     <!-- 批量开启缴费 -->