--no commit message

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

@@ -105,6 +105,7 @@ public class FgMajorServiceImpl extends BaseModelServiceImpl<Major,Integer> impl
 		Major s = new Major();
 		s.setName(form.getName());
 		s.setRelationId(redis.getMember().getRelationId());
+		s.setType(redis.getMember().getType());
 		Integer count = fgMajorMapper.selectCount(s);
 		if(count > 0){
 			log.info("FgMajorServiceImpl#isExistName name: "+ form.getName()  +"专业名称已存在");

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/publiclesson/FgPublicLessonService.java

@@ -91,6 +91,27 @@ public interface FgPublicLessonService extends BaseService<PublicLesson,Integer>
 	 * @date: 2019年7月30日 上午9:50:40
 	 */
 	ExportLessonErrVo importLesson(MultipartFile file,Integer planId,String type);
+	
+	 /**
+	  * 课程名称校验
+	 * @param form
+	 * @param oldEntity
+	 * @return
+	 * @author zzg
+	 * @date: 2019年8月1日 上午9:28:38
+	 */
+	boolean isExsitName(PublicLesson form,PublicLesson oldEntity);
+	
+	
+	 /**
+	  * 课程名称校验（导出）
+	 * @param form
+	 * @param oldEntity
+	 * @return
+	 * @author zzg
+	 * @date: 2019年8月1日 上午9:51:41
+	 */
+	String exportCheck(String name);
 	 
 	 
 

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/publiclesson/FgPublicLessonServiceImpl.java

@@ -188,6 +188,8 @@ public class FgPublicLessonServiceImpl extends BaseModelServiceImpl<PublicLesson
 
 	@Override
 	public boolean save(FgSavePublicLeesonForm form) {
+		//课程名称校验
+		this.isExsitName(form, null);
 		form.setRelationId(redis.getMember().getRelationId());
 		form.setType(redis.getMember().getType());
 		form.setLeesonType(PublicLessonClassArrangeRealtionTypeEnum.PUBLIC.getCode());
@@ -242,6 +244,8 @@ public class FgPublicLessonServiceImpl extends BaseModelServiceImpl<PublicLesson
 	@Override
 	public boolean update(FgSavePublicLeesonForm form) {
 		PublicLesson entity = super.notNull(form.getId());
+		//课程名称校验
+		this.isExsitName(form, entity);
 		BeanUtils.copyProperties(form, entity);
 		updateByPrimaryKey(entity);
 		
@@ -373,6 +377,8 @@ public class FgPublicLessonServiceImpl extends BaseModelServiceImpl<PublicLesson
 
 	@Override
 	public boolean saveBasic(FgSavePublicLeesonForm form) {
+		//课程名称校验
+		this.isExsitName(form, null);
 		form.setRelationId(redis.getMember().getRelationId());
 		form.setType(redis.getMember().getType());
 		form.setLeesonType(PublicLessonClassArrangeRealtionTypeEnum.BASIC.getCode());
@@ -403,6 +409,8 @@ public class FgPublicLessonServiceImpl extends BaseModelServiceImpl<PublicLesson
 	@Override
 	public boolean updateBasic(FgSavePublicLeesonForm form) {
 		PublicLesson entity = super.notNull(form.getId());
+		//课程名称校验
+		this.isExsitName(form, entity);
 		BeanUtils.copyProperties(form, entity);
 		updateByPrimaryKey(entity);
 		//删除教材和课程安排的关系
@@ -461,6 +469,13 @@ public class FgPublicLessonServiceImpl extends BaseModelServiceImpl<PublicLesson
 				list.add(vo);
 				continue;
 			}
+			//课程名称校验
+			String msg = this.exportCheck(v.getCourseDesign());
+			if(StringUtils.isNotEmpty(msg)){
+				vo.setMsg(msg);
+				list.add(vo);
+				continue;
+			}
 			newList.add(v);
 		}
 		//根据教材名称对导入的excel集合进行分组
@@ -569,6 +584,40 @@ public class FgPublicLessonServiceImpl extends BaseModelServiceImpl<PublicLesson
 		}
 		return null;
 	}
+
+	@Override
+	public boolean isExsitName(PublicLesson form, PublicLesson oldEntity) {
+		if (StringUtils.isBlank(form.getCourseDesign())) {
+			return true;
+		}
+		if (oldEntity != null && form.getCourseDesign().equals(oldEntity.getCourseDesign())) {
+			return true;
+		}
+		PublicLesson s = new PublicLesson();
+		s.setCourseDesign(form.getCourseDesign());
+		s.setRelationId(redis.getMember().getRelationId());
+		s.setType(redis.getMember().getType());
+		Integer count = fgPublicLessonMapper.selectCount(s);
+		if(count > 0){
+			log.info("FgPublicLessonServiceImpl#isExistName name: "+ form.getCourseDesign()  +"课程名称已存在");
+			throw new BusinessValidateException("课程名称: "+ form.getCourseDesign()  +"课程名称已存在");
+		}
+		return true;
+	}
+
+	@Override
+	public String exportCheck(String name) {
+		PublicLesson s = new PublicLesson();
+		s.setCourseDesign(name);
+		s.setRelationId(redis.getMember().getRelationId());
+		s.setType(redis.getMember().getType());
+		Integer count = fgPublicLessonMapper.selectCount(s);
+		if(count > 0){
+			log.info("FgPublicLessonServiceImpl#exportCheck name: "+ name  +"课程名称已存在");
+			return "课程名称: "+ name  +"课程名称已存在";
+		}
+		return null;
+	}