--no commit message

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

@@ -35,6 +35,8 @@ import com.zrqx.core.vo.schoolsysuser.fg.student.ImportStudentVo;
 import com.zrqx.core.vo.schoolsysuser.fg.student.StudentVo;
 import com.zrqx.school.sysuser.client.FgMemberClient;
 import com.zrqx.school.sysuser.service.classmanagement.FgClassManagementService;
+import com.zrqx.school.sysuser.service.export.ExportService;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
@@ -47,6 +49,8 @@ public class FgClassManagementController {
 	private FgClassManagementService fgClassManagementService;
 	@Autowired
 	private FgRedisManage redis;
+	@Autowired
+	private ExportService exportService;
 	
 	@ApiOperation(value = "班级列表",notes = "分页查询")
 	@GetMapping(value = MemberRequestPath.PAGE)
@@ -114,7 +118,7 @@ public class FgClassManagementController {
 	@ApiOperation(value = "导出学生错误信息")
 	@GetMapping(value = MemberRequestPath.ERROR)
 	public String exportRole(Integer id,HttpServletRequest request, HttpServletResponse response) throws Exception {
-		List<?> list = fgClassManagementService.exportErrInfo(id);
+		List<?> list = exportService.exportErrInfo(id);
 		ExcelUtil.getInstance().exportExcel(list, ClassmanagementErrVo.class, "班级错误信息.xls", response, request);
 		return null;
 	}

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

@@ -29,6 +29,7 @@ import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.util.response.CallBack;
 import com.zrqx.core.vo.schoolsysuser.fg.student.ExcelStudentVo;
 import com.zrqx.core.vo.schoolsysuser.fg.student.StudentVo;
+import com.zrqx.school.sysuser.service.export.ExportService;
 import com.zrqx.school.sysuser.service.student.FgStudentService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -40,7 +41,8 @@ public class FgStudentController {
 
 	@Autowired
 	private FgStudentService fgStudentService;
-	
+	@Autowired
+	private ExportService exportService;
 	
 	@ApiOperation(value = "学生列表",notes = "分页查询")
 	@GetMapping(value = MemberRequestPath.PAGE)
@@ -99,7 +101,7 @@ public class FgStudentController {
 	@ApiOperation(value = "导出学生错误信息")
 	@GetMapping(value = MemberRequestPath.ERROR)
 	public String exportRole(Integer id,HttpServletRequest request, HttpServletResponse response) throws Exception {
-		List<?> list = fgStudentService.exportErrInfo(id);
+		List<?> list = exportService.exportErrInfo(id);
 		ExcelUtil.getInstance().exportExcel(list, StudentVo.class, "学生错误信息.xls", response, request);
 		return null;
 	}

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

@@ -64,7 +64,7 @@ public interface FgBasicTeachingPlanMapper extends BaseMapper<BasicTeachingPlan>
 	
 	
 	@Select(" <script> "
-			+ " select pb.*,p.basicPlanId from me_public_basic_relation pb  LEFT JOIN  me_public_lessons p  ON pb.lessonId = p.id "
+			+ " select pb.*,p.basicPlanId,t.majotId from me_public_basic_relation pb  LEFT JOIN  me_public_lessons p  ON pb.lessonId = p.id "
 			+ " LEFT JOIN me_basic_teaching_plan t on p.basicPlanId = t.id "
 			+ " WHERE  1=1 and p.lessonType = 0 "
 			+ " <if test = ' query.relationId != null '> "  

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

@@ -101,14 +101,6 @@ public interface FgClassManagementService extends BaseService<ClassManagement,In
 	 */
 	String isExistStuLevel(ClassManagement form);
 	
-	 /**
-	  * 导出班级错误信息
-	 * @param id
-	 * @return
-	 * @throws ClassNotFoundException
-	 * @author zzg
-	 * @date: 2019年7月25日 下午6:58:53
-	 */
-	List<?> exportErrInfo(Integer id) throws ClassNotFoundException;
+	 
 
 }

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

@@ -255,19 +255,7 @@ public class FgClassManagementServiceImpl extends BaseModelServiceImpl<ClassMana
 	
 	
 	
-	@Override
-	public List<?> exportErrInfo(Integer id) throws ClassNotFoundException {
-		List<ClassmanagementErrVo> list = new ArrayList<ClassmanagementErrVo>();
-		Export entity = exportMapper.selectByPrimaryKey(id);
-		// 解析
-		Class<?> clazz = Class.forName(entity.getClazz());
-		List<?> parselist = JSON.parseArray(entity.getValue(), clazz);
-		for(int i = 0; i < parselist.size(); i++){
-			ClassmanagementErrVo vo = BeanUtils.copy(parselist.get(i), ClassmanagementErrVo.class);
-			list.add(vo);
-		}
-		return list;
-	}
+	
 	
 
 }

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/export/ExportService.java

 package com.zrqx.school.sysuser.service.export;
 
+import java.util.List;
+
 import com.zrqx.core.model.school.export.Export;
 import com.zrqx.core.service.BaseService;
 
 public interface ExportService extends BaseService<Export,Integer>{
 	
+	 /**
+	  * 导出excel错误信息
+	 * @param id
+	 * @return
+	 * @throws ClassNotFoundException
+	 * @author zzg
+	 * @date: 2019年7月26日 上午11:24:11
+	 */
+	List<?> exportErrInfo(Integer id) throws ClassNotFoundException;
+
 }

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/export/ExportServiceImpl.java

 package com.zrqx.school.sysuser.service.export;
 
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 
+import com.alibaba.fastjson.JSON;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.school.export.Export;
 import com.zrqx.core.service.BaseServiceImpl;
@@ -17,4 +20,14 @@ public class ExportServiceImpl extends BaseServiceImpl<Export,Integer> implement
 		return exportMapper;
 	}
 	
+	
+	@Override
+	public List<?> exportErrInfo(Integer id) throws ClassNotFoundException {
+		Export entity = exportMapper.selectByPrimaryKey(id);
+		// 解析
+		Class<?> clazz = Class.forName(entity.getClazz());
+		List<?> parselist = JSON.parseArray(entity.getValue(), clazz);
+		return parselist;
+	}
+
 }

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

@@ -112,13 +112,6 @@ public interface FgStudentService extends BaseService<Student,Integer>{
 	 */
 	String isExistNumber(Student form);
 	
-	 /**
-	  * 导出错误信息
-	 * @param id
-	 * @return
-	 * @author zzg
-	 * @date: 2019年7月24日 上午10:52:22
-	 */
-	List<?> exportErrInfo(Integer id) throws ClassNotFoundException;
+	 
 
 }

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

@@ -256,20 +256,7 @@ public class FgStudentServiceImpl extends BaseModelServiceImpl<Student,Integer>
 		return entity;
 	}
 
-	@Override
-	public List<?> exportErrInfo(Integer id) throws ClassNotFoundException {
-		List<StudentVo> list = new ArrayList<StudentVo>();
-		Export entity = exportMapper.selectByPrimaryKey(id);
-		// 解析
-		Class<?> clazz = Class.forName(entity.getClazz());
-		List<?> parselist = JSON.parseArray(entity.getValue(), clazz);
 	
-		for(int i = 0; i < parselist.size(); i++){
-			StudentVo vo = BeanUtils.copy(parselist.get(i), StudentVo.class);
-			list.add(vo);
-		}
-		return list;
-	}