Merge branch 'import_250116' of http://git.dayaedu.com/yonge/cooleshow into test

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

@@ -136,10 +136,14 @@ public class StudentImportAnalysis extends DataAnalysis<StudentImportAnalysis> {
             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(",");
+                if (split.length > 1) {
+                    ret.append("声部最多选择1个;");
                 }
-                item.setSubjectId(subjectMap.get(item.getSubjectName()));
+                if (!subjectMap.containsKey(split[0])) {
+                    ret.append("声部无效:").append(split[0]).append(";");
+                }
+                item.setSubjectId(subjectMap.get(split[0]));
             }
             if (StringUtils.isEmpty(item.getTenantName())) {
                 ret.append("机构名称不能为空;");
@@ -148,16 +152,18 @@ public class StudentImportAnalysis extends DataAnalysis<StudentImportAnalysis> {
                     item.setTenantId(-1L);
                 }else {
                     if (!tenantMap.containsKey(item.getTenantName())) {
-                        ret.append("机构无效:").append(item.getTenantName());
+                        ret.append("机构无效:").append(item.getTenantName()).append(";");
                     }
                     item.setTenantId(tenantMap.get(item.getTenantName()));
                 }
             }
             if (StringUtils.isEmpty(item.getTenantGroupName())) {
-                ret.append("小组名称不能为空;");
+                if(!"平台".equals(item.getTenantName())){
+                    ret.append("小组名称不能为空;");
+                }
             }else {
                 if (!tenantGroupMap.containsKey(item.getTenantGroupName())) {
-                    ret.append("小组名称无效:").append(item.getTenantGroupName());
+                    ret.append("小组名称无效:").append(item.getTenantGroupName()).append(";");
                 }
                 List<TenantGroup> tenantGroups = tenantGroupMap.get(item.getTenantGroupName());
                 //根据机构id和小组名称获取小组id
@@ -166,7 +172,7 @@ public class StudentImportAnalysis extends DataAnalysis<StudentImportAnalysis> {
                     if (Objects.nonNull(tenantGroup)) {
                         item.setTenantGroupId(tenantGroup.getId());
                     } else {
-                        ret.append("小组名称无效:").append(item.getTenantGroupName());
+                        ret.append("小组名称无效:").append(item.getTenantGroupName()).append(";");
                     }
                 }
             }

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

@@ -169,7 +169,7 @@ public class TeacherImportAnalysis extends DataAnalysis<TeacherImportAnalysis> {
                     item.setTenantId(-1L);
                 }else {
                     if (!tenantMap.containsKey(item.getTenantName())) {
-                        ret.append("机构无效:").append(item.getTenantName());
+                        ret.append("机构无效:").append(item.getTenantName()).append(";");
                     }
                     item.setTenantId(tenantMap.get(item.getTenantName()));
                 }