老师导入

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/execl/analysis/TeacherImportAnalysis.java

@@ -146,9 +146,18 @@ public class TeacherImportAnalysis extends DataAnalysis<TeacherImportAnalysis> {
             if (StringUtils.isEmpty(item.getSubjectName())) {
                 ret.append("老师声部不能为空;");
             }else {
-                if (!subjectMap.containsKey(item.getSubjectName())) {
-                    ret.append("声部无效:").append(item.getSubjectName());
+                String[] split = item.getSubjectName().replaceAll(" ", "").replaceAll("，", ",").split(",");
+                String subjectIds = "";
+                for (String s : split) {
+                    if (!subjectMap.containsKey(s)) {
+                        ret.append("声部无效:").append(s);
+                    }
+                    if(StringUtils.isNotEmpty(subjectIds)){
+                        subjectIds += ",";
+                    }
+                    subjectIds += subjectMap.get(s);
                 }
+                item.setSubjectId(subjectIds);
             }
             if (StringUtils.isEmpty(item.getTenantName())) {
                 ret.append("机构名称不能为空;");