--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/vo/member/fg/publiclesson/ExcelLessonVo.java

@@ -14,17 +14,19 @@ import lombok.Data;
 @ExcelSheetParams(startRow = 2)
 public class ExcelLessonVo {
 
-	@ExcelResources(title="课程设置",order=1)
+	@ExcelResources(title="课程设置")
 	private String courseDesign;
-	@ExcelResources(title="教材数量",order=2)
+	@ExcelResources(title="教材数量")
 	private Integer num;
-	@ExcelResources(title="教材名称",order=3)
+	@ExcelResources(title="教材名称")
 	private String resourceName;
-	@ExcelResources(title="习题册",order=4)
+	@ExcelResources(title="习题册")
 	private String exerciseBook;
-	@ExcelResources(title="理论课时",order=5)
+	@ExcelResources(title="理论课时")
 	private Integer theoryClassHour;
-	@ExcelResources(title="实训课时",order=6)
+	@ExcelResources(title="实训课时")
 	private Integer trainingHours;
+	@ExcelResources(title="培养层次")
+	private String name;
 
 }

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

@@ -108,5 +108,22 @@ public interface FgBasicTeachingPlanMapper extends BaseMapper<BasicTeachingPlan>
 		    + " </script> ")
 	BasicTeachingPlan query(@Param("query") QueryTypeAndRelationIdForm form);
 	
+	 /**
+	  * 根据课程id查询公共课程绑定的培养层次
+	 * @param id
+	 * @return
+	 * @author zzg
+	 * @date: 2019年8月1日 上午11:03:57
+	 */
+	@Select(" <script> "
+			+ " select b.name from me_basic_teaching_plan b  "
+			+ " LEFT JOIN me_public_lessons_plan_relation l ON b.id = l.basicPlanId "
+			+ " where 1 = 1 "
+			+ " <if test = ' id != null '> "  
+		    + " and l.publicLessonId =  #{id} "
+		    + " </if> "
+		    + " </script> ")
+	List<String> getName(@Param("id") Integer id);
+	
 
 }

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

@@ -267,7 +267,5 @@ public class FgMajorServiceImpl extends BaseModelServiceImpl<Major,Integer> impl
 	
 	
 	
-	
-	
 
 }

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

@@ -365,12 +365,24 @@ public class FgPublicLessonServiceImpl extends BaseModelServiceImpl<PublicLesson
 
 	@Override
 	public List<FgPublicLessonVo> export(PageParam pageParam, String type,Integer basicPlanId) {
+		this.fmtOrderBy(pageParam);
+		orderBy(pageParam);
+		BasicTeachingPlan plan = fgBasicTeachingPlanMapper.selectByPrimaryKey(basicPlanId);
 		QueryTypeAndRelationIdForm query = new QueryTypeAndRelationIdForm();
 		query.setRelationId(redis.getMember().getRelationId());
 		query.setType(redis.getMember().getType());
 		List<FgPublicLessonVo> list = fgPublicLessonMapper.list(type,query,basicPlanId);
 		list.forEach(vo ->{
 			this.queryResourceName(vo);
+			if(basicPlanId != null){
+				vo.setName(plan.getName());
+			}
+			//根据公共课id查询公共课绑定的培养层次
+			List<String> strs = fgBasicTeachingPlanMapper.getName(vo.getId());
+			if(ArrayUtils.isNotEmpty(strs)){
+				String name = StringUtils.join(strs.toArray(),"、");
+				vo.setName(name);
+			}
 		});
 		return list;
 	}