--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/constant/member/MemberRequestPath.java

@@ -52,6 +52,8 @@ public class MemberRequestPath extends BaseRequestPath {
 	public static final String PROVINCE_LIST = "/province" + LIST;
 	/** 学级列表*/
 	public static final String ACADEMIC_LEVEL_LIST = "/academic-level" + LIST;
+	/** 专业列表*/
+	public static final String MAJOR_LIST = "/major" + LIST;
 	/** 市份列表*/
 	public static final String CITY_LIST = "/city" + LIST;
 	

com.zrqx.core/src/main/java/com/zrqx/core/vo/schoolsysuser/fg/book/RecommendMajorVo.java

+package com.zrqx.core.vo.schoolsysuser.fg.book;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "RecommendMajorVo", description = "教材推荐专业vo")
+public class RecommendMajorVo {
+	
+	@ApiModelProperty("专业id")
+    private Integer majorId;
+
+    @ApiModelProperty("专业名称")
+    private String majorName;
+
+}

com.zrqx.core/src/main/java/com/zrqx/core/vo/schoolsysuser/fg/book/RecommendPlanVo.java

+package com.zrqx.core.vo.schoolsysuser.fg.book;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "RecommendPlanVo", description = "教材推荐培养层次vo")
+public class RecommendPlanVo {
+	
+	@ApiModelProperty("培养层次id")
+	private Integer basicPlanId;
+	@ApiModelProperty("培养层次名称")
+	private String name;
+
+}

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/controller/basicteachingplan/FgBasicTeachingPlanController.java

@@ -95,7 +95,7 @@ public class FgBasicTeachingPlanController {
 	
 	@ApiOperation(value = "学级列表", notes = "去重之后的学级列表")
 	@GetMapping(value = MemberRequestPath.ACADEMIC_LEVEL_LIST)
-	public CallBack<List<String>> listAcademicLevel(QueryAcademicLevelForm form) {
+	public CallBack<List<Integer>> listAcademicLevel(QueryAcademicLevelForm form) {
 		// 获取系统中存在的学级并去重
 		return CallBack.success(fgBasicTeachingPlanService.listAcademicLevel(form));
 	}

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/controller/classmanagement/FgClassManagementController.java

@@ -18,6 +18,7 @@ import com.zrqx.core.commons.redis.FgRedisManage;
 import com.zrqx.core.constant.member.MemberRequestPath;
 import com.zrqx.core.enums.ResponseCodeEnum;
 import com.zrqx.core.exception.BaseException;
+import com.zrqx.core.form.member.fg.basicteachingplan.QueryAcademicLevelForm;
 import com.zrqx.core.form.school.sysuser.fg.classmanagement.QueryClassManagementForm;
 import com.zrqx.core.model.member.classmanagement.ClassManagement;
 import com.zrqx.core.util.bean.BeanUtils;
@@ -122,5 +123,13 @@ public class FgClassManagementController {
 		ExcelUtil.getInstance().exportExcel(list, ClassmanagementErrVo.class, "班级错误信息.xls", response, request);
 		return null;
 	}
+	
+	
+	@ApiOperation(value = "学级列表", notes = "去重之后的学级列表")
+	@GetMapping(value = MemberRequestPath.ACADEMIC_LEVEL_LIST)
+	public CallBack<List<Integer>> listAcademicLevel(QueryAcademicLevelForm form) {
+		// 获取系统中存在的学级并去重
+		return CallBack.success(fgClassManagementService.listAcademicLevel(form));
+	}
 
 }

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/controller/publiclesson/FgPublicBasicRelationController.java

@@ -9,10 +9,13 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.zrqx.core.constant.member.MemberRequestPath;
 import com.zrqx.core.constant.school.sysuser.SchoolRequestPath;
+import com.zrqx.core.form.member.fg.basicteachingplan.QueryAcademicLevelForm;
+import com.zrqx.core.model.member.major.Major;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.util.response.CallBack;
 import com.zrqx.core.vo.member.fg.publiclesson.FgPublicLessonVo;
+import com.zrqx.core.vo.schoolsysuser.fg.book.RecommendMajorVo;
 import com.zrqx.core.vo.schoolsysuser.fg.publicbasicrelation.FgPublicBasicRelationVo;
 import com.zrqx.school.sysuser.service.publiclesson.FgPublicBasicRelationService;
 
@@ -32,5 +35,26 @@ public class FgPublicBasicRelationController {
 	public CallBack<List<FgPublicBasicRelationVo>> page() throws Exception {
 		return CallBack.success(fgPublicBasicRelationService.list());
 	}
+	
+	@ApiOperation(value = "学级列表", notes = "去重之后的学级列表")
+	@GetMapping(value = MemberRequestPath.ACADEMIC_LEVEL_LIST)
+	public CallBack<List<Integer>> listAcademicLevel(QueryAcademicLevelForm form) {
+		// 获取系统中存在的学级并去重
+		return CallBack.success(fgPublicBasicRelationService.listAcademicLevel(form));
+	}
+	
+	
+	@ApiOperation(value = "专业列表", notes = "专业列表")
+	@GetMapping(value = MemberRequestPath.MAJOR_LIST)
+	public CallBack<List<RecommendMajorVo>> listMajor(QueryAcademicLevelForm form) {
+		return CallBack.success(fgPublicBasicRelationService.listMajor(form));
+	}
+	
+	
+	@ApiOperation(value = "培养层次列表", notes = "培养层次列表")
+	@GetMapping(value = MemberRequestPath.MAJOR_LIST)
+	public CallBack<List<RecommendMajorVo>> listPlan(QueryAcademicLevelForm form) {
+		return CallBack.success(fgPublicBasicRelationService.listPlan(form));
+	}
 
 }

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/controller/student/FgStudentController.java

@@ -19,6 +19,7 @@ import com.zrqx.core.constant.member.MemberRequestPath;
 import com.zrqx.core.enums.ResponseCodeEnum;
 import com.zrqx.core.enums.member.member.MemberSexEnum;
 import com.zrqx.core.exception.BaseException;
+import com.zrqx.core.form.member.fg.basicteachingplan.QueryAcademicLevelForm;
 import com.zrqx.core.form.school.sysuser.fg.student.QueryStudentForm;
 import com.zrqx.core.model.member.student.Student;
 import com.zrqx.core.util.bean.BeanUtils;
@@ -119,5 +120,13 @@ public class FgStudentController {
 	public CallBack<Student> get(){
 		return CallBack.success(fgStudentService.get());
 	}
+	
+	
+	@ApiOperation(value = "学级列表", notes = "去重之后的学级列表")
+	@GetMapping(value = MemberRequestPath.ACADEMIC_LEVEL_LIST)
+	public CallBack<List<Integer>> listAcademicLevel(QueryAcademicLevelForm form) {
+		// 获取系统中存在的学级并去重
+		return CallBack.success(fgStudentService.listAcademicLevel(form));
+	}
 
 }

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/mapper/basicteachingplan/FgBasicTeachingPlanMapper.java

@@ -60,7 +60,7 @@ public interface FgBasicTeachingPlanMapper extends BaseMapper<BasicTeachingPlan>
 			+ " group by s.academicLevel "
 			+ " order by  academicLevel desc "
 			+ " </script> ")
-	List<String> listAcademicLevel(@Param("query") QueryAcademicLevelForm form);
+	List<Integer> listAcademicLevel(@Param("query") QueryAcademicLevelForm form);
 	
 	
 	@Select(" <script> "

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/mapper/classmanagement/FgClassManagementMapper.java

@@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import com.zrqx.core.form.member.bg.department.QueryTypeAndRelationIdForm;
+import com.zrqx.core.form.member.fg.basicteachingplan.QueryAcademicLevelForm;
 import com.zrqx.core.form.member.fg.major.FgQueryMajorForm;
 import com.zrqx.core.form.school.sysuser.fg.classmanagement.QueryClassManagementForm;
 import com.zrqx.core.mapper.BaseMapper;
@@ -56,5 +57,27 @@ public interface FgClassManagementMapper extends BaseMapper<ClassManagement>{
 		    + " </script> ")
 	ClassManagement get(@Param("query") QueryTypeAndRelationIdForm form);
 	
+	
+	 /**
+	  * 学级列表
+	 * @param form
+	 * @return
+	 * @author zzg
+	 * @date: 2019年7月31日 上午9:44:20
+	 */
+	@Select(" <script> "
+			+ " SELECT s.academicLevel "
+			+ " FROM me_class_mamagement s WHERE  1=1 "
+			+ " <if test = ' query.relationId != null '> "  
+		    + " and s.relationId =  #{query.relationId} "
+		    + " </if> "
+		    + " <if test = '" + NOTBLANK + "(query.type)'> "  
+		    + " and s.type =  #{query.type} "
+		    + " </if> "
+			+ " group by s.academicLevel "
+			+ " order by  academicLevel desc "
+			+ " </script> ")
+	List<Integer> listAcademicLevel(@Param("query") QueryAcademicLevelForm form);
+	
 
 }

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/mapper/publiclesson/FgPublicBasicRelationMapper.java

@@ -7,9 +7,11 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import com.zrqx.core.form.member.fg.basicteachingplan.FgQueryBasicTeachingPlanForm;
+import com.zrqx.core.form.member.fg.basicteachingplan.QueryAcademicLevelForm;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.member.publiclesson.PublicBasicRelation;
 import com.zrqx.core.vo.member.fg.basicteachingplan.FgBasicTeachingPlanVo;
+import com.zrqx.core.vo.schoolsysuser.fg.book.RecommendMajorVo;
 
 @Mapper
 public interface FgPublicBasicRelationMapper extends BaseMapper<PublicBasicRelation>{
@@ -39,5 +41,49 @@ public interface FgPublicBasicRelationMapper extends BaseMapper<PublicBasicRelat
 		    + " </if> "
 		    + " </script> ")
 	List<FgBasicTeachingPlanVo> list(@Param("query") FgQueryBasicTeachingPlanForm query);
+	
+	
+	/**
+	  * 教材推荐学级列表
+	 * @param form
+	 * @return
+	 * @author zzg
+	 * @date: 2019年7月31日 上午9:44:20
+	 */
+	@Select(" <script> "
+			+ " SELECT s.academicLevel "
+			+ " FROM me_book_recommend s WHERE  1=1 "
+			+ " <if test = ' query.relationId != null '> "  
+		    + " and s.relationId =  #{query.relationId} "
+		    + " </if> "
+		    + " <if test = '" + NOTBLANK + "(query.type)'> "  
+		    + " and s.type =  #{query.type} "
+		    + " </if> "
+			+ " group by s.academicLevel "
+			+ " order by  academicLevel desc "
+			+ " </script> ")
+	List<Integer> listAcademicLevel(@Param("query") QueryAcademicLevelForm form);
+	
+	
+	/**
+	  * 教材推荐专业列表
+	 * @param form
+	 * @return
+	 * @author zzg
+	 * @date: 2019年7月31日 上午9:44:20
+	 */
+	@Select(" <script> "
+			+ " SELECT s.majorId,s.majorName "
+			+ " FROM me_book_recommend s WHERE  1=1 "
+			+ " <if test = ' query.relationId != null '> "  
+		    + " and s.relationId =  #{query.relationId} "
+		    + " </if> "
+		    + " <if test = '" + NOTBLANK + "(query.type)'> "  
+		    + " and s.type =  #{query.type} "
+		    + " </if> "
+			+ " group by s.academicLevel "
+			+ " order by  academicLevel desc "
+			+ " </script> ")
+	List<RecommendMajorVo> listMajor(@Param("query") QueryAcademicLevelForm form);
 
 }

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/mapper/student/FgStudentMapper.java

@@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import com.zrqx.core.form.member.bg.department.QueryTypeAndRelationIdForm;
+import com.zrqx.core.form.member.fg.basicteachingplan.QueryAcademicLevelForm;
 import com.zrqx.core.form.school.sysuser.fg.classmanagement.QueryClassManagementForm;
 import com.zrqx.core.form.school.sysuser.fg.student.QueryStudentForm;
 import com.zrqx.core.mapper.BaseMapper;
@@ -61,5 +62,27 @@ public interface FgStudentMapper extends BaseMapper<Student>{
 		    + " limit 1 "
 		    + " </script> ")
 	Student get(@Param("query") QueryTypeAndRelationIdForm form);
+	
+	
+	/**
+	  * 学级列表
+	 * @param form
+	 * @return
+	 * @author zzg
+	 * @date: 2019年7月31日 上午9:44:20
+	 */
+	@Select(" <script> "
+			+ " SELECT s.academicLevel "
+			+ " FROM me_student s WHERE  1=1 "
+			+ " <if test = ' query.relationId != null '> "  
+		    + " and s.relationId =  #{query.relationId} "
+		    + " </if> "
+		    + " <if test = '" + NOTBLANK + "(query.type)'> "  
+		    + " and s.type =  #{query.type} "
+		    + " </if> "
+			+ " group by s.academicLevel "
+			+ " order by  academicLevel desc "
+			+ " </script> ")
+	List<Integer> listAcademicLevel(@Param("query") QueryAcademicLevelForm form);
 
 }

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

@@ -59,7 +59,7 @@ public interface FgBasicTeachingPlanService extends BaseService<BasicTeachingPla
 	 * @author zzg
 	 * @date: 2019年6月28日 下午2:30:23
 	 */
-	List<String> listAcademicLevel(QueryAcademicLevelForm form);
+	List<Integer> listAcademicLevel(QueryAcademicLevelForm form);
 	
 	
 	 /**

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

@@ -155,10 +155,10 @@ public class FgBasicTeachingPlanServiceImpl extends BaseModelServiceImpl<BasicTe
 		return true;
 	}
 	@Override
-	public List<String> listAcademicLevel(QueryAcademicLevelForm form) {
+	public List<Integer> listAcademicLevel(QueryAcademicLevelForm form) {
 		form.setRelationId(redis.getMember().getRelationId());
 		form.setType(redis.getMember().getType());
-		List<String> list = fgBasicTeachingPlanMapper.listAcademicLevel(form);
+		List<Integer> list = fgBasicTeachingPlanMapper.listAcademicLevel(form);
 		return list;
 	}
 	@Override

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

@@ -4,6 +4,7 @@ import java.util.List;
 
 import org.springframework.web.multipart.MultipartFile;
 
+import com.zrqx.core.form.member.fg.basicteachingplan.QueryAcademicLevelForm;
 import com.zrqx.core.form.school.sysuser.fg.classmanagement.QueryClassManagementForm;
 import com.zrqx.core.model.member.classmanagement.ClassManagement;
 import com.zrqx.core.service.BaseService;
@@ -101,6 +102,13 @@ public interface FgClassManagementService extends BaseService<ClassManagement,In
 	 */
 	String isExistStuLevel(ClassManagement form);
 	
-	 
+	 /**
+	  * 学级列表
+	 * @param form
+	 * @return
+	 * @author zzg
+	 * @date: 2019年7月31日 上午9:41:19
+	 */
+	List<Integer> listAcademicLevel(QueryAcademicLevelForm form);
 
 }

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

@@ -15,6 +15,7 @@ import com.alibaba.fastjson.JSON;
 import com.zrqx.core.commons.redis.FgRedisManage;
 import com.zrqx.core.exception.BusinessValidateException;
 import com.zrqx.core.form.member.bg.department.QueryTypeAndRelationIdForm;
+import com.zrqx.core.form.member.fg.basicteachingplan.QueryAcademicLevelForm;
 import com.zrqx.core.form.school.sysuser.fg.classmanagement.QueryClassManagementForm;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.member.basicteachingplan.BasicTeachingPlan;
@@ -249,7 +250,13 @@ public class FgClassManagementServiceImpl extends BaseModelServiceImpl<ClassMana
 	}
 	
 	
-	
+	@Override
+	public List<Integer> listAcademicLevel(QueryAcademicLevelForm form) {
+		form.setRelationId(redis.getMember().getRelationId());
+		form.setType(redis.getMember().getType());
+		List<Integer> list = fgClassManagementMapper.listAcademicLevel(form);
+		return list;
+	}
 	
 	
 	

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

@@ -2,8 +2,11 @@ package com.zrqx.school.sysuser.service.publiclesson;
 
 import java.util.List;
 
+import com.zrqx.core.form.member.fg.basicteachingplan.QueryAcademicLevelForm;
+import com.zrqx.core.model.member.major.Major;
 import com.zrqx.core.model.member.publiclesson.PublicBasicRelation;
 import com.zrqx.core.service.BaseService;
+import com.zrqx.core.vo.schoolsysuser.fg.book.RecommendMajorVo;
 import com.zrqx.core.vo.schoolsysuser.fg.publicbasicrelation.FgPublicBasicRelationVo;
 import com.zrqx.core.vo.schoolsysuser.fg.publicbasicrelation.PublicBasicRelationVo;
 import com.zrqx.core.vo.schoolsysuser.fg.publiclesson.ImportLessonExcelVo;
@@ -62,5 +65,33 @@ public interface FgPublicBasicRelationService extends BaseService<PublicBasicRel
 	 */
 	Integer exportSave(ImportLessonExcelVo vo,Integer id,String type);
 	
+	 /**
+	  * 教材推荐学级列表
+	 * @param form
+	 * @return
+	 * @author zzg
+	 * @date: 2019年7月31日 上午9:53:44
+	 */
+	List<Integer> listAcademicLevel(QueryAcademicLevelForm form);
+	
+	
+	/**
+	  * 教材推荐专业列表
+	 * @param form
+	 * @return
+	 * @author zzg
+	 * @date: 2019年7月31日 上午9:53:44
+	 */
+	List<RecommendMajorVo> listMajor(QueryAcademicLevelForm form);
+	
+	/**
+	  * 教材推荐培养层次列表
+	 * @param form
+	 * @return
+	 * @author zzg
+	 * @date: 2019年7月31日 上午9:53:44
+	 */
+	List<RecommendMajorVo> listPlan(QueryAcademicLevelForm form);
+	
 
 }

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

@@ -11,6 +11,7 @@ import com.zrqx.core.enums.school.sysuser.ClassManagementEnrollmentTimeEnum;
 import com.zrqx.core.enums.school.sysuser.MethodTypeEnum;
 import com.zrqx.core.exception.BusinessValidateException;
 import com.zrqx.core.form.member.bg.department.QueryTypeAndRelationIdForm;
+import com.zrqx.core.form.member.fg.basicteachingplan.QueryAcademicLevelForm;
 import com.zrqx.core.form.school.sysuser.fg.schoollibrary.QuerySchoolAsedLibraryForm;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.member.basicteachingplan.BasicTeachingPlan;
@@ -22,6 +23,7 @@ import com.zrqx.core.service.BaseServiceImpl;
 import com.zrqx.core.util.bean.BeanUtils;
 import com.zrqx.core.util.response.CallBack;
 import com.zrqx.core.vo.resource.fg.goods.phy.ResourceSearchVo;
+import com.zrqx.core.vo.schoolsysuser.fg.book.RecommendMajorVo;
 import com.zrqx.core.vo.schoolsysuser.fg.publicbasicrelation.FgPublicBasicRelationVo;
 import com.zrqx.core.vo.schoolsysuser.fg.publicbasicrelation.PublicBasicRelationVo;
 import com.zrqx.core.vo.schoolsysuser.fg.publiclesson.ImportLessonExcelVo;
@@ -169,7 +171,29 @@ public class FgPublicBasicRelationServiceImpl extends BaseServiceImpl<PublicBasi
 		return entity.getId();
 	}
 	
-	
+	@Override
+	public List<Integer> listAcademicLevel(QueryAcademicLevelForm form) {
+		form.setRelationId(redis.getMember().getRelationId());
+		form.setType(redis.getMember().getType());
+		List<Integer> list = fgPublicBasicRelationMapper.listAcademicLevel(form);
+		return list;
+	}
+
+	@Override
+	public List<RecommendMajorVo> listMajor(QueryAcademicLevelForm form) {
+		form.setRelationId(redis.getMember().getRelationId());
+		form.setType(redis.getMember().getType());
+		List<RecommendMajorVo> list = fgPublicBasicRelationMapper.listMajor(form);
+		return list;
+	}
+
+	@Override
+	public List<RecommendMajorVo> listPlan(QueryAcademicLevelForm form) {
+		form.setRelationId(redis.getMember().getRelationId());
+		form.setType(redis.getMember().getType());
+		List<RecommendMajorVo> list = fgPublicBasicRelationMapper.listMajor(form);
+		return list;
+	}
 	
 	
 }

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

@@ -6,6 +6,7 @@ import com.zrqx.core.form.member.fg.publiclesson.FgSavePublicLeesonForm;
 import com.zrqx.core.model.member.publiclesson.PublicLessonClassArrangeRealtion;
 import com.zrqx.core.service.BaseService;
 import com.zrqx.core.vo.schoolsysuser.fg.publicbasicrelation.PublicBasicRelationVo;
+import com.zrqx.core.vo.schoolsysuser.fg.publiclesson.ImportLessonExcelVo;
 
 public interface FgPublicLessonClassArrangeRealtionService extends BaseService<PublicLessonClassArrangeRealtion,Integer>{
 	
@@ -48,6 +49,16 @@ public interface FgPublicLessonClassArrangeRealtionService extends BaseService<P
 	 */
 	boolean save(List<PublicLessonClassArrangeRealtion> pcrs,Integer id);
 	
+	 /**
+	  * 绑定教材和课时的关系
+	 * @param vo
+	 * @param id
+	 * @return
+	 * @author zzg
+	 * @date: 2019年7月31日 上午9:12:06
+	 */
+	boolean exportSave(ImportLessonExcelVo vo, Integer id);
+	
 	
 
 }

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

@@ -13,6 +13,7 @@ import com.zrqx.core.model.member.publiclesson.PublicLessonClassArrangeRealtion;
 import com.zrqx.core.model.member.publiclesson.PublicLessonPlanRelation;
 import com.zrqx.core.service.BaseServiceImpl;
 import com.zrqx.core.vo.schoolsysuser.fg.publicbasicrelation.PublicBasicRelationVo;
+import com.zrqx.core.vo.schoolsysuser.fg.publiclesson.ImportLessonExcelVo;
 import com.zrqx.school.sysuser.mapper.publiclesson.FgPublicBasicRelationMapper;
 import com.zrqx.school.sysuser.mapper.publiclesson.FgPublicLessonClassArrangeRealtionMapper;
 
@@ -70,6 +71,15 @@ public class FgPublicLessonClassArrangeRealtionServiceImpl extends BaseServiceIm
 		});
 		return true;
 	}
+	@Override
+	public boolean exportSave(ImportLessonExcelVo vo, Integer id) {
+		PublicLessonClassArrangeRealtion entity = new PublicLessonClassArrangeRealtion();
+		entity.setCreateTime(new Date());
+		entity.setMaterialId(id);
+		entity.setSemester(vo.getSemester());
+		entity.setWeeklyHours(vo.getWeeklyHours());
+		return super.insert(entity);
+	}
 	
 	
 

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

@@ -83,6 +83,7 @@ public class FgPublicLessonServiceImpl extends BaseModelServiceImpl<PublicLesson
 	private ExportMapper exportMapper;
 	
 	
+	
 	@Override
 	public BaseMapper<PublicLesson> getMapper() {
 		return fgPublicLessonMapper;
@@ -430,6 +431,8 @@ public class FgPublicLessonServiceImpl extends BaseModelServiceImpl<PublicLesson
 
 	@Override
 	public ExportLessonErrVo importLesson(MultipartFile file, Integer planId,String type) {
+		//获取学校的教学周
+		School school = fgSchoolMapper.query(redis.getMember().getRelationId());
 		//导入的信息集合
 		List<ImportLessonExcelVo> importExcelVos = new ArrayList<ImportLessonExcelVo>();
 		//导入失败的培养层次信息
@@ -460,7 +463,7 @@ public class FgPublicLessonServiceImpl extends BaseModelServiceImpl<PublicLesson
 			}
 			newList.add(v);
 		}
-		
+		//根据教材名称对导入的excel集合进行分组
 		Map<String, List<ImportLessonExcelVo>> map = newList.stream().collect(Collectors.groupingBy
 				(ImportLessonExcelVo::getCourseDesign,Collectors.toList()));
 		for(String key : map.keySet()){
@@ -483,6 +486,7 @@ public class FgPublicLessonServiceImpl extends BaseModelServiceImpl<PublicLesson
 					}
 				}
 			}
+			//根据教材数量(n)进行判断，若导入的条数大于数量(n)，则只取n条数据，将多余数据以错误数据进行导出；若导入的数量小于n,则全部导入
 			if(vList.size() > num){
 				voList = vList.subList(0, num);
 				errList = vList.subList(num, vList.size());
@@ -494,6 +498,17 @@ public class FgPublicLessonServiceImpl extends BaseModelServiceImpl<PublicLesson
 			}else{
 				voList.addAll(vList);
 			}
+			
+			FgSavePublicLeesonForm form = new FgSavePublicLeesonForm();
+			form.setTheoryClassHour(theoryClassHour);
+			form.setTrainingHours(trainingHours);
+			
+			List<PublicLessonClassArrangeRealtion> vvList = new ArrayList<PublicLessonClassArrangeRealtion>();
+			BeanUtils.copyList(voList, PublicLessonClassArrangeRealtion.class);
+			
+			//校验理论课时与实际课时之和是否和课时安排的课时相等
+			this.check(form, school, vvList);
+			
 			//向数据库中插入正确的数据
 			PublicLesson pl = new PublicLesson();
 			pl.setCourseDesign(key);
@@ -504,16 +519,14 @@ public class FgPublicLessonServiceImpl extends BaseModelServiceImpl<PublicLesson
 			pl.setTheoryClassHour(theoryClassHour);
 			pl.setTrainingHours(trainingHours);
 			super.insert(pl);
+			
 			//绑定课程跟教材的关系
 			voList.forEach(vo ->{
 				Integer id = fgPublicBasicRelationService.exportSave(vo, pl.getId(), type);
 				//绑定教材和课时的关系
-				
+				fgPublicLessonClassArrangeRealtionService.exportSave(vo, id);
 			});
-			
-			
 		}
-		
 		Export entity = new Export();
 		if(list != null && list.size() > 0){
 			String value = JSON.toJSONString(list);

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

@@ -4,6 +4,7 @@ import java.util.List;
 
 import org.springframework.web.multipart.MultipartFile;
 
+import com.zrqx.core.form.member.fg.basicteachingplan.QueryAcademicLevelForm;
 import com.zrqx.core.form.school.sysuser.fg.student.QueryStudentForm;
 import com.zrqx.core.model.member.classmanagement.ClassManagement;
 import com.zrqx.core.model.member.student.Student;
@@ -122,6 +123,13 @@ public interface FgStudentService extends BaseService<Student,Integer>{
 	 */
 	String isExistStuLevel(Student form);
 	
-	 
+	 /**
+	  * 学级列表
+	 * @param form
+	 * @return
+	 * @author zzg
+	 * @date: 2019年7月31日 上午9:48:38
+	 */
+	List<Integer> listAcademicLevel(QueryAcademicLevelForm form);
 
 }

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

@@ -18,6 +18,7 @@ import com.zrqx.core.commons.redis.FgRedisManage;
 import com.zrqx.core.enums.member.member.MemberSexEnum;
 import com.zrqx.core.exception.BusinessValidateException;
 import com.zrqx.core.form.member.bg.department.QueryTypeAndRelationIdForm;
+import com.zrqx.core.form.member.fg.basicteachingplan.QueryAcademicLevelForm;
 import com.zrqx.core.form.school.sysuser.fg.student.QueryStudentForm;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.member.basicteachingplan.BasicTeachingPlan;
@@ -315,6 +316,12 @@ public class FgStudentServiceImpl extends BaseModelServiceImpl<Student,Integer>
 		return null;
 	}
 	
-	
+	@Override
+	public List<Integer> listAcademicLevel(QueryAcademicLevelForm form) {
+		form.setRelationId(redis.getMember().getRelationId());
+		form.setType(redis.getMember().getType());
+		List<Integer> list = fgStudentMapper.listAcademicLevel(form);
+		return list;
+	}
 
 }