--no commit message

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

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

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

@@ -365,9 +365,9 @@ public class FgPublicLessonServiceImpl extends BaseModelServiceImpl<PublicLesson
 
 	@Override
 	public List<FgPublicLessonVo> export(PageParam pageParam, String type,Integer basicPlanId) {
+		BasicTeachingPlan plan = fgBasicTeachingPlanMapper.selectByPrimaryKey(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());