--no commit message

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/manage/basicteachingplan/FgBasicTeachingPlanManage.java

@@ -5,6 +5,7 @@ import org.springframework.stereotype.Component;
 
 import com.zrqx.core.form.member.bg.department.QueryTypeAndRelationIdForm;
 import com.zrqx.core.model.member.basicteachingplan.BasicTeachingPlan;
+import com.zrqx.core.model.member.classmanagement.ClassManagement;
 import com.zrqx.school.sysuser.mapper.basicteachingplan.FgBasicTeachingPlanMapper;
 
 @Component
@@ -30,5 +31,7 @@ public class FgBasicTeachingPlanManage {
 		BasicTeachingPlan plan = fgBasicTeachingPlanMapper.query(query);
 		return plan;
 	}
+	
+	
 
 }

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/basicteachingplan/FgBasicTeachingPlanServiceImpl.java

@@ -193,6 +193,11 @@ public class FgBasicTeachingPlanServiceImpl extends BaseModelServiceImpl<BasicTe
 		}
 		//插入数据
 		for(ImportPlanExcelVo v : importExcelVos){
+			String dptMsg = null;
+			String majorMsg = null;
+			String trainMsg = null;
+			String systemMsg = null;
+			String resourceMsg = null;
 			BasicPlanErrVo vo = BeanUtils.copy(v, BasicPlanErrVo.class);
 			BasicTeachingPlan entity = BeanUtils.copy(v, BasicTeachingPlan.class);
 			//验证部门是否存在
@@ -200,32 +205,36 @@ public class FgBasicTeachingPlanServiceImpl extends BaseModelServiceImpl<BasicTe
 			if(StringUtils.isNotEmpty(v.getDepartmentName())){
 				departmentId = fgDepartmentManage.isExsitDepart(redis.getMember().getRelationId(),redis.getMember().getType(),v.getDepartmentName());
 				if(departmentId == null){
-					vo.setMsg("导入的部门不存在");
+					dptMsg = "导入的部门不存在";
 				}
 			}else{
-				vo.setMsg("请输入部门名称");
+				dptMsg = "请输入部门名称";
 			}
 			//验证专业是否存在
 			Major major = new Major();
 			if(StringUtils.isNotEmpty(v.getMajorName())){
 				major = fgMajorManage.isExistMajorName(v.getMajorName());
 				if(major == null){
-					vo.setMsg("导入的专业不存在");
+					majorMsg = "导入的专业不存在";
 				}
 			}else{
-				vo.setMsg("请填写专业名称");
+				majorMsg = "请填写专业名称";
 			}
 			if(v.getEducationalSystem() == null){
-				vo.setMsg("请输入学制");
+				systemMsg = "请输入学制";
 			}
 			if(StringUtils.isEmpty(v.getStudentResource())){
-				vo.setMsg("请填写生源");
+				resourceMsg = "请填写生源";
 			}
 			//验证定向培养
 			if(StringUtils.isNotEmpty(v.getTrain())){
-				String trainMsg = fgDictionaryDataManage.isExistTrain(redis.getMember().getRelationId(), redis.getMember().getType(), v.getTrain());
+				trainMsg = fgDictionaryDataManage.isExistTrain(redis.getMember().getRelationId(), redis.getMember().getType(), v.getTrain());
 				vo.setMsg(trainMsg);
 			}
+			
+			String countMsg = (StringUtils.isEmpty(dptMsg) ? "" : dptMsg) + (StringUtils.isEmpty(majorMsg) ? "" : majorMsg) + (StringUtils.isEmpty(trainMsg) ? "" : trainMsg) + (StringUtils.isNotEmpty(systemMsg) ? "" : systemMsg) + (StringUtils.isNotEmpty(resourceMsg) ? "" : resourceMsg);
+			vo.setMsg(countMsg);
+			
 			if(departmentId == null || major == null || v.getEducationalSystem() == null || StringUtils.isEmpty(v.getStudentResource())){
 				list.add(vo);
 				continue;

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

@@ -202,11 +202,9 @@ public class FgClassManagementServiceImpl extends BaseModelServiceImpl<ClassMana
 			if(plan == null){
 				planMsg = "导入的培养层次不存在";
 			}
-			if(StringUtils.isNotEmpty(bptMsg) || StringUtils.isNotEmpty(majorMsg) || StringUtils.isNotEmpty(planMsg) || StringUtils.isNotEmpty(msg) || StringUtils.isNotEmpty(msg1)){
-				String countMsg = bptMsg + majorMsg + planMsg + msg + msg1;
-				countMsg.replace(null, "");
-				vo.setMsg(countMsg);
-			}
+			String countMsg = (StringUtils.isEmpty(bptMsg) ? "" : bptMsg) + (StringUtils.isEmpty(majorMsg) ? "" : majorMsg) + (StringUtils.isEmpty(planMsg) ? "" : planMsg) + (StringUtils.isEmpty(msg) ? "" : msg) + (StringUtils.isEmpty(msg1) ? "" : msg1);
+			vo.setMsg(countMsg);
+			
 			if(StringUtils.isNotEmpty(msg) || StringUtils.isNotEmpty(msg1) || data == null || major == null || plan == null){
 				list.add(vo);
 				continue;

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/major/FgMajorServiceImpl.java

@@ -228,6 +228,10 @@ public class FgMajorServiceImpl extends BaseModelServiceImpl<Major,Integer> impl
 			if(StringUtils.isNotEmpty(dptMsg) || StringUtils.isNotEmpty(majorMsg) || StringUtils.isNotEmpty(proMsg)){
 				vo.setMsg(dptMsg + majorMsg + proMsg);
 			}
+			
+			String countMsg = (StringUtils.isEmpty(dptMsg) ? "" : dptMsg) + (StringUtils.isEmpty(majorMsg) ? "" : majorMsg) + (StringUtils.isEmpty(proMsg) ? "" : proMsg);
+			vo.setMsg(countMsg);
+			
 			if(data == null || major != null || pro == null){
 				list.add(vo);
 				continue;

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/student/FgStudentServiceImpl.java

@@ -37,9 +37,11 @@ import com.zrqx.core.vo.schoolsysuser.fg.student.StudentVo;
 import com.zrqx.school.sysuser.manage.basicteachingplan.FgBasicTeachingPlanManage;
 import com.zrqx.school.sysuser.manage.department.FgDepartmentManage;
 import com.zrqx.school.sysuser.manage.major.FgMajorManage;
+import com.zrqx.school.sysuser.mapper.basicteachingplan.FgBasicTeachingPlanMapper;
 import com.zrqx.school.sysuser.mapper.classmanagement.FgClassManagementMapper;
 import com.zrqx.school.sysuser.mapper.export.ExportMapper;
 import com.zrqx.school.sysuser.mapper.student.FgStudentMapper;
+import com.zrqx.school.sysuser.service.classmanagement.FgClassManagementService;
 
 
 @Service
@@ -60,6 +62,9 @@ public class FgStudentServiceImpl extends BaseModelServiceImpl<Student,Integer>
 	private FgMajorManage fgMajorManage;
 	@Autowired
 	private FgBasicTeachingPlanManage fgBasicTeachingPlanManage;
+	@Autowired
+	private FgBasicTeachingPlanMapper fgBasicTeachingPlanMapper;
+	
 
 	@Override
 	public BaseMapper<Student> getMapper() {
@@ -214,14 +219,18 @@ public class FgStudentServiceImpl extends BaseModelServiceImpl<Student,Integer>
 				vo.setMsg("每个字段都为必填项");
 			}
 			Student stu = BeanUtils.copy(v, Student.class);
+			String dptMsg = null;
+			String majorMsg = null;
+			String planMsg = null;
+			String classMsg = null;
 			//验证部门是否存在
 			Integer departmentId = fgDepartmentManage.isExsitDepart(redis.getMember().getRelationId(),redis.getMember().getType(),v.getDepartmentName());
 			if(StringUtils.isNotEmpty(v.getDepartmentName())){
 				if(departmentId == null){
-					vo.setMsg("导入的部门不存在");
+					dptMsg = "导入的部门不存在";
 				}
 			}else{
-				vo.setMsg("请输入部门名称");
+				dptMsg = "请输入部门名称";
 			}
 			//验证学级是否存在
 			String levelMsg = this.isExistStuLevel(stu);
@@ -230,39 +239,38 @@ public class FgStudentServiceImpl extends BaseModelServiceImpl<Student,Integer>
 			Major major = fgMajorManage.isExistMajorName(v.getMajorName());
 			if(StringUtils.isNotEmpty(v.getMajorName())){
 				if(major == null){
-					vo.setMsg("导入的专业不存在");
+					majorMsg = "导入的专业不存在";
 				}
 			}else{
-				vo.setMsg("请填写专业名称");
+				majorMsg = "请填写专业名称";
 			}
 			//验证培养层次是否存在
 			BasicTeachingPlan plan = fgBasicTeachingPlanManage.isExsitPlan(redis.getMember().getRelationId(), redis.getMember().getType(), v.getPlanName());
 			if(StringUtils.isNotEmpty(v.getPlanName())){
 				if(plan == null){
-					vo.setMsg("培养层次不存在");
+					planMsg = "培养层次不存在";
 				}
 			}else{
-				vo.setMsg("请填写正确的培养层次");
+				planMsg = "请填写正确的培养层次";
 			}
 			
 			//验证学号
 			String msg = this.isExistID(stu);
 			//验证身份证号码
 			String msg1 = this.isExistNumber(stu);
-			if(StringUtils.isNotEmpty(msg) && StringUtils.isNotEmpty(msg1)){
-				vo.setMsg(msg + "," + msg1);
-			}
-			if(StringUtils.isNotEmpty(msg1) || StringUtils.isNotEmpty(msg1)){
-				vo.setMsg(msg + "或" + msg1);
-			}
+			
 			ClassManagement form = new ClassManagement();
 			form.setName(v.getClassName());
 			form.setRelationId(redis.getMember().getRelationId());
 			form.setType(redis.getMember().getType());
 			ClassManagement entity = fgClassManagementMapper.selectOne(form);
 			if(entity == null){
-				vo.setMsg("导入的班级不存在");
+				classMsg = "导入的班级不存在";
 			}
+			
+			String countMsg = (StringUtils.isEmpty(dptMsg) ? "" : dptMsg) + (StringUtils.isEmpty(majorMsg) ? "" : majorMsg) + (StringUtils.isEmpty(planMsg) ? "" : planMsg) + (StringUtils.isEmpty(msg) ? "" : msg) + (StringUtils.isEmpty(msg1) ? "" : msg1) + (StringUtils.isEmpty(levelMsg) ? "" : levelMsg) + (StringUtils.isEmpty(classMsg) ? "" : classMsg);
+			vo.setMsg(countMsg);
+			
 			if(plan == null || major == null || StringUtils.isNotEmpty(msg) || StringUtils.isNotEmpty(msg1) || entity == null || departmentId == null || StringUtils.isNotEmpty(levelMsg)){
 				list.add(vo);
 				continue;
@@ -305,11 +313,11 @@ public class FgStudentServiceImpl extends BaseModelServiceImpl<Student,Integer>
 	
 	@Override
 	public String isExistStuLevel(Student form) {
-		Student s = new Student();
+		BasicTeachingPlan s = new BasicTeachingPlan();
 		s.setAcademicLevel(form.getAcademicLevel());
 		s.setRelationId(redis.getMember().getRelationId());
 		s.setType(redis.getMember().getType());
-		Integer count = fgStudentMapper.selectCount(s);
+		Integer count = fgBasicTeachingPlanMapper.selectCount(s);
 		if(count == 0){
 			return "学级: "+ form.getAcademicLevel()  +"学级不存在";
 		}