zouxuan há 4 anos atrás
pai
commit
3b67eb31cd

+ 2 - 2
mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysUserRole.java

@@ -9,13 +9,13 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 public class SysUserRole {
 	//分部经理
 	public static Integer SECTION_MANAGER = 3;
-	//教务老师
+	//教务老师、乐团主管
 	public static Integer EDUCATIONAL_TEACHER = 4;
 	//运营主管
 	public static Integer OPERATION_EXECUTIVE = 5;
 	//招生主管
 	public static Integer ADMISSIONS_DIRECTOR = 6;
-	//教学主任
+	//教学主任、乐队指导
 	public static Integer DEAN_OF_STUDIES = 7;
 	//总部管理员
 	public static Integer ADMINISTRATOR = 25;

+ 11 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroup.java

@@ -150,6 +150,9 @@ public class MusicGroup {
 
 	private Integer repairUserId;
 
+	@ApiModelProperty(value = "维修技师名称",required = true)
+	private String repairUserName;
+
 	@ApiModelProperty(value = "预计开团日期",required = true)
 	private Date expectStartGroupDate;
 
@@ -164,6 +167,14 @@ public class MusicGroup {
 
 	private Boolean hasVerifyMusicalList = false;
 
+	public String getRepairUserName() {
+		return repairUserName;
+	}
+
+	public void setRepairUserName(String repairUserName) {
+		this.repairUserName = repairUserName;
+	}
+
 	public Integer getPaymentPattern() {
 		return paymentPattern;
 	}

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

@@ -2452,6 +2452,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         musicGroup.setEducationalTeacherName(teacherDao.queryNameById(musicGroup.getEducationalTeacherId()));
         musicGroup.setTeamTeacherName(teacherDao.queryNameById(musicGroup.getTeamTeacherId()));
         musicGroup.setDirectorUserName(teacherDao.queryNameById(musicGroup.getDirectorUserId()));
+        musicGroup.setRepairUserName(teacherDao.queryNameById(musicGroup.getRepairUserId()));
         Organization organization = organizationDao.get(musicGroup.getOrganId());
         if (organization != null) {
             musicGroup.setOrganName(organization.getName());