--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/vo/schoolsysuser/fg/classmanagement/ImportClassVo.java

@@ -23,7 +23,7 @@ public class ImportClassVo {
 	private String planName;
 	@ExcelResources(title="班级名称")
 	private String name;
-	@ExcelResources(title="人数")
+	@ExcelResources(title="班级人数")
 	private String num;
 	@ExcelResources(title="入学时间")
 	private String enrollmentTime;

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/classmanagement/FgClassManagementServiceImpl.java

@@ -160,6 +160,10 @@ public class FgClassManagementServiceImpl extends BaseModelServiceImpl<ClassMana
 		}
 		//插入数据
 		for(ImportClassVo v : importExcelVos){
+			String bptMsg = null;
+			String majorMsg = null;
+			String planMsg = null;
+			
 			ClassmanagementErrVo vo = BeanUtils.copy(v, ClassmanagementErrVo.class);
 			if(v.getAcademicLevel() == null || StringUtils.isEmpty(v.getDepartmentName()) || StringUtils.isEmpty(v.getMajorName()) || StringUtils.isEmpty(v.getName()) || StringUtils.isEmpty(v.getNum()) || StringUtils.isEmpty(v.getPlanName())){
 				vo.setMsg("每个字段都为必填项");
@@ -174,17 +178,17 @@ public class FgClassManagementServiceImpl extends BaseModelServiceImpl<ClassMana
 			form.setName(v.getDepartmentName());
 			CallBack<Integer> data = fgMemberClient.isExsit(form);
 			if(data == null){
-				vo.setMsg("导入的部门不存在");
+				bptMsg = "导入的部门不存在";
 			}
 			//验证导入的专业是否存在
 			Major major = new Major();
 			if(StringUtils.isNotEmpty(v.getMajorName())){
 				major = fgMajorService.isExistName(v.getMajorName());
 				if(major == null){
-					vo.setMsg("导入的专业不存在");
+					majorMsg = "导入的专业不存在";
 				}
 			}else{
-				vo.setMsg("请填写专业名称");
+				majorMsg = "请填写专业名称";
 			}
 			//验证导入的学级是否存在
 			String msg1 = this.isExistStuLevel(entity);
@@ -196,7 +200,10 @@ public class FgClassManagementServiceImpl extends BaseModelServiceImpl<ClassMana
 			query.setRelationId(redis.getMember().getRelationId());
 			BasicTeachingPlan plan = fgBasicTeachingPlanMapper.query(query);
 			if(plan == null){
-				vo.setMsg("导入的培养层次不存在");
+				planMsg = "导入的培养层次不存在";
+			}
+			if(StringUtils.isNotEmpty(bptMsg) || StringUtils.isNotEmpty(majorMsg) || StringUtils.isNotEmpty(planMsg) || StringUtils.isNotEmpty(msg) || StringUtils.isNotEmpty(msg1)){
+				vo.setMsg(bptMsg + majorMsg + planMsg + msg + msg1);
 			}
 			if(StringUtils.isNotEmpty(msg) || StringUtils.isNotEmpty(msg1) || data == null || major == null || plan == null){
 				list.add(vo);
@@ -238,11 +245,11 @@ public class FgClassManagementServiceImpl extends BaseModelServiceImpl<ClassMana
 
 	@Override
 	public String isExistStuLevel(ClassManagement form) {
-		ClassManagement s = new ClassManagement();
+		BasicTeachingPlan s = new BasicTeachingPlan();
 		s.setAcademicLevel(form.getAcademicLevel());
 		s.setRelationId(redis.getMember().getRelationId());
 		s.setType(redis.getMember().getType());
-		Integer count = fgClassManagementMapper.selectCount(s);
+		Integer count = fgBasicTeachingPlanMapper.selectCount(s);
 		if(count == 0){
 			return "学级: "+ form.getAcademicLevel()  +"学级不存在";
 		}