Browse Source

涉及乐团id类型修改

周箭河 5 năm trước cách đây
mục cha
commit
fce083e6af

+ 3 - 3
mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ClassGroupTeacherMapper.java

@@ -19,7 +19,7 @@ public class ClassGroupTeacherMapper {
 	
 	/**  */
 	@ApiModelProperty(value = "乐团编号",required = false)
-	private Integer musicGroupId;
+	private String musicGroupId;
 	
 	/**  */
 	@ApiModelProperty(value = "班级编号",required = false)
@@ -57,11 +57,11 @@ public class ClassGroupTeacherMapper {
 		return this.id;
 	}
 			
-	public void setMusicGroupId(Integer musicGroupId){
+	public void setMusicGroupId(String musicGroupId){
 		this.musicGroupId = musicGroupId;
 	}
 	
-	public Integer getMusicGroupId(){
+	public String getMusicGroupId(){
 		return this.musicGroupId;
 	}
 			

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

@@ -180,7 +180,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
             //2、插入班级关联老师
             ClassGroupTeacherMapper classGroupTeacherMapper = new ClassGroupTeacherMapper();
-            classGroupTeacherMapper.setMusicGroupId(highClassGroup.getUserId());
+            classGroupTeacherMapper.setMusicGroupId(highClassGroup.getMusicGroupId());
             classGroupTeacherMapper.setClassGroupId(highClassGroup.getId());
             classGroupTeacherMapper.setTeacherRole(TeachTypeEnum.BISHOP);
             classGroupTeacherMapper.setUserId(highClassGroup.getUserId());

+ 5 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupTeacherMapperServiceImpl.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.service.impl;
 
+import com.ym.mec.biz.dal.entity.TeacherDefaultMusicGroupSalary;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -39,7 +40,10 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
 
     public boolean classGroupTeacherMapperUpdate(List<ClassGroupTeacherMapper> classGroupTeacherMapperList) throws Exception {
         for (ClassGroupTeacherMapper classGroupTeacherMapper : classGroupTeacherMapperList) {
-            classGroupTeacherMapper.getTeacherDefaultMusicGroupSalaryList();
+            List<TeacherDefaultMusicGroupSalary> teacherDefaultMusicGroupSalaryList = classGroupTeacherMapper.getTeacherDefaultMusicGroupSalaryList();
+            for (TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalary : teacherDefaultMusicGroupSalaryList) {
+                
+            }
 
             classGroupTeacherMapperDao.update(classGroupTeacherMapper);
         }

+ 1 - 1
mec-biz/src/main/resources/config/mybatis/ClassGroupTeacherMapperMapper.xml

@@ -111,7 +111,7 @@
         </foreach>
     </select>
 
-    <!-- 删除对应乐团老师管理关系 -->
+    <!-- 删除对应乐团老师关联关系 -->
     <delete id="delMusicGroupTeacherMapper">
         DELETE FROM class_group_teacher_mapper WHERE class_group_id_ IN
         <foreach collection="classGroupTeacherMapperList" item="item" index="index" open="(" close=")" separator=",">