--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/vo/schoolsysuser/fg/basicteachingplan/BasicPlanErrVo.java

 package com.zrqx.core.vo.schoolsysuser.fg.basicteachingplan;
 
-import com.zrqx.core.model.school.export.ExportModel;
 import com.zrqx.core.util.excelutil.ExcelResources;
 import com.zrqx.core.util.excelutil.ExcelSheetParams;
 import io.swagger.annotations.ApiModel;
@@ -9,7 +8,7 @@ import lombok.Data;
 @Data
 @ExcelSheetParams(startRow = 2)
 @ApiModel(value = "BasicPlanErrVo",description = "培养层次错误信息列表vo")
-public class BasicPlanErrVo extends ExportModel{
+public class BasicPlanErrVo{
 
 	@ExcelResources(title="学级")
 	private Integer academicLevel;
@@ -23,5 +22,7 @@ public class BasicPlanErrVo extends ExportModel{
 	private Integer educationalSystem;
 	@ApiModelProperty("定向培养(非必填)")
 	private Integer train;
+	@ExcelResources(title="错误信息")
+	private String msg;
 
 }

com.zrqx.core/src/main/java/com/zrqx/core/vo/schoolsysuser/fg/major/MajorErrVo.java

 package com.zrqx.core.vo.schoolsysuser.fg.major;
 
-import com.zrqx.core.model.school.export.ExportModel;
 import com.zrqx.core.util.excelutil.ExcelResources;
 import com.zrqx.core.util.excelutil.ExcelSheetParams;
 
 import lombok.Data;
 @Data
 @ExcelSheetParams(startRow = 2)
-public class MajorErrVo extends ExportModel{
+public class MajorErrVo{
 
 	@ExcelResources(title="部门名称")
 	private String departmentName;
@@ -15,5 +14,7 @@ public class MajorErrVo extends ExportModel{
 	private String name;
 	@ExcelResources(title="专业代码")
 	private String code;
+	@ExcelResources(title="错误信息")
+	private String msg;
 
 }

com.zrqx.core/src/main/java/com/zrqx/core/vo/schoolsysuser/fg/publiclesson/LessonErrVo.java

 package com.zrqx.core.vo.schoolsysuser.fg.publiclesson;
 
 import javax.validation.constraints.NotNull;
-
-import com.zrqx.core.model.school.export.ExportModel;
 import com.zrqx.core.util.excelutil.ExcelResources;
 import com.zrqx.core.util.excelutil.ExcelSheetParams;
 import io.swagger.annotations.ApiModel;
@@ -11,7 +9,7 @@ import lombok.Data;
 @Data
 @ExcelSheetParams(startRow = 2)
 @ApiModel(value = "LessonErrVo",description = "课程错误信息列表vo")
-public class LessonErrVo extends ExportModel{
+public class LessonErrVo{
 	
 	@NotNull
 	@ExcelResources(title="课程设置")
@@ -38,5 +36,7 @@ public class LessonErrVo extends ExportModel{
 	@NotNull
 	@ExcelResources(title="周课时数")
 	private Integer weeklyHours;
+	@ExcelResources(title="错误信息")
+	private String msg;
 
 }

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

@@ -28,6 +28,7 @@ import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.util.response.CallBack;
 import com.zrqx.core.vo.member.fg.basicteachingplan.FgBasicTeachingPlanExcelVo;
 import com.zrqx.core.vo.member.fg.basicteachingplan.FgBasicTeachingPlanVo;
+import com.zrqx.core.vo.schoolsysuser.fg.basicteachingplan.BasicPlanErrVo;
 import com.zrqx.core.vo.schoolsysuser.fg.major.MajorErrVo;
 import com.zrqx.school.sysuser.service.basicteachingplan.FgBasicTeachingPlanService;
 import com.zrqx.school.sysuser.service.export.ExportService;
@@ -117,7 +118,7 @@ public class FgBasicTeachingPlanController {
 	@GetMapping(value = MemberRequestPath.ERROR)
 	public String exportMajor(Integer id,HttpServletRequest request, HttpServletResponse response) throws Exception {
 		List<?> list = exportService.exportErrInfo(id);
-		ExcelUtil.getInstance().exportExcel(list, MajorErrVo.class, "培养层次错误信息.xls", response, request);
+		ExcelUtil.getInstance().exportExcel(list, BasicPlanErrVo.class, "培养层次错误信息.xls", response, request);
 		return null;
 	}
 	

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

@@ -32,6 +32,7 @@ import com.zrqx.core.vo.member.fg.major.FgMajorVo;
 import com.zrqx.core.vo.member.fg.publiclesson.ExcelLessonVo;
 import com.zrqx.core.vo.member.fg.publiclesson.FgPublicLessonVo;
 import com.zrqx.core.vo.schoolsysuser.fg.major.MajorErrVo;
+import com.zrqx.core.vo.schoolsysuser.fg.publiclesson.LessonErrVo;
 import com.zrqx.school.sysuser.service.export.ExportService;
 import com.zrqx.school.sysuser.service.publiclesson.FgPublicLessonService;
 import io.swagger.annotations.Api;
@@ -118,7 +119,7 @@ public class FgPublicLessonController {
 	@GetMapping(value = MemberRequestPath.ERROR)
 	public String exportMajor(Integer id,HttpServletRequest request, HttpServletResponse response) throws Exception {
 		List<?> list = exportService.exportErrInfo(id);
-		ExcelUtil.getInstance().exportExcel(list, MajorErrVo.class, "课程错误信息.xls", response, request);
+		ExcelUtil.getInstance().exportExcel(list, LessonErrVo.class, "课程错误信息.xls", response, request);
 		return null;
 	}
 

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

@@ -11,7 +11,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
-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;
@@ -36,7 +35,6 @@ import com.zrqx.school.sysuser.manage.dictionarydata.FgDictionaryDataManage;
 import com.zrqx.school.sysuser.manage.export.ExportManage;
 import com.zrqx.school.sysuser.manage.major.FgMajorManage;
 import com.zrqx.school.sysuser.mapper.basicteachingplan.FgBasicTeachingPlanMapper;
-import com.zrqx.school.sysuser.mapper.export.ExportMapper;
 import com.zrqx.school.sysuser.mapper.major.FgProfessionalMapper;
 import com.zrqx.school.sysuser.service.major.FgMajorService;
 import com.zrqx.school.sysuser.service.major.FgProfessionalService;
@@ -62,8 +60,6 @@ public class FgBasicTeachingPlanServiceImpl extends BaseModelServiceImpl<BasicTe
 	@Autowired
 	private FgProfessionalService fgProfessionalService;
 	@Autowired
-	private ExportMapper exportMapper;
-	@Autowired
 	private FgDictionaryDataManage fgDictionaryDataManage;
 	@Autowired
 	private ExportManage exportManage;
@@ -260,14 +256,8 @@ public class FgBasicTeachingPlanServiceImpl extends BaseModelServiceImpl<BasicTe
 			entity.setType(redis.getMember().getType());
 			super.insert(entity);
 		}
+		//保存错误信息
 		Export entity = exportManage.save(list, "com.zrqx.core.vo.schoolsysuser.fg.basicteachingplan.BasicPlanErrVo");
-		/*Export entity = new Export();
-		if(list != null && list.size() > 0){
-			String value = JSON.toJSONString(list);
-			entity.setValue(value);
-			entity.setClazz("com.zrqx.core.vo.schoolsysuser.fg.basicteachingplan.BasicPlanErrVo");
-			exportMapper.insert(entity);
-		}*/
 		planVo.setList(list);
 		planVo.setErrId(entity.getId());
 		return planVo;

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

@@ -10,8 +10,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
-
-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;
@@ -33,9 +31,9 @@ import com.zrqx.core.vo.schoolsysuser.fg.classmanagement.ClassmanagementErrVo;
 import com.zrqx.core.vo.schoolsysuser.fg.classmanagement.ExportClassErrVo;
 import com.zrqx.core.vo.schoolsysuser.fg.classmanagement.ImportClassVo;
 import com.zrqx.school.sysuser.client.FgMemberClient;
+import com.zrqx.school.sysuser.manage.export.ExportManage;
 import com.zrqx.school.sysuser.mapper.basicteachingplan.FgBasicTeachingPlanMapper;
 import com.zrqx.school.sysuser.mapper.classmanagement.FgClassManagementMapper;
-import com.zrqx.school.sysuser.mapper.export.ExportMapper;
 import com.zrqx.school.sysuser.service.major.FgMajorService;
 
 @Service
@@ -52,7 +50,7 @@ public class FgClassManagementServiceImpl extends BaseModelServiceImpl<ClassMana
 	@Autowired
 	private FgMajorService fgMajorService;
 	@Autowired
-	private ExportMapper exportMapper;
+	private ExportManage exportManage;
 
 	@Override
 	public BaseMapper<ClassManagement> getMapper() {
@@ -217,13 +215,8 @@ public class FgClassManagementServiceImpl extends BaseModelServiceImpl<ClassMana
 			entity.setType(redis.getMember().getType());
 			super.insert(entity);
 		}
-		Export entity = new Export();
-		if(list != null && list.size() > 0){
-			String value = JSON.toJSONString(list);
-			entity.setValue(value);
-			entity.setClazz("com.zrqx.core.vo.schoolsysuser.fg.classmanagement.ClassmanagementErrVo");
-			exportMapper.insert(entity);
-		}
+		Export entity = exportManage.save(list, "com.zrqx.core.vo.schoolsysuser.fg.classmanagement.ClassmanagementErrVo");
+		
 		classVo.setList(list);
 		classVo.setErrId(entity.getId());
 		return classVo;

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

@@ -34,6 +34,7 @@ import com.zrqx.core.vo.schoolsysuser.fg.major.ExportMajorErrVo;
 import com.zrqx.core.vo.schoolsysuser.fg.major.ImportMajorExcelVo;
 import com.zrqx.core.vo.schoolsysuser.fg.major.MajorErrVo;
 import com.zrqx.school.sysuser.client.FgMemberClient;
+import com.zrqx.school.sysuser.manage.export.ExportManage;
 import com.zrqx.school.sysuser.mapper.export.ExportMapper;
 import com.zrqx.school.sysuser.mapper.major.FgMajorMapper;
 
@@ -50,6 +51,8 @@ public class FgMajorServiceImpl extends BaseModelServiceImpl<Major,Integer> impl
 	private ExportMapper exportMapper;
 	@Autowired
 	private FgProfessionalService fgProfessionalService;
+	@Autowired
+	private ExportManage exportManage;
 	
 
 	@Override
@@ -201,14 +204,14 @@ public class FgMajorServiceImpl extends BaseModelServiceImpl<Major,Integer> impl
 			form.setName(v.getDepartmentName());
 			CallBack<Integer> data = fgMemberClient.isExsit(form);
 			if(data == null){
-				dptMsg = "导入的部门不存在";
+				dptMsg = "部门不存在";
 			}
 			//验证导入的专业名称是否存在
 			Major major = new Major();
 			if(StringUtils.isNotEmpty(v.getName())){
 				major = this.isExistName(v.getName());
 				if(major != null){
-					majorMsg = "导入的专业已存在";
+					majorMsg = "专业已存在";
 				}
 			}else{
 				majorMsg = "请填写专业名称";
@@ -220,7 +223,7 @@ public class FgMajorServiceImpl extends BaseModelServiceImpl<Major,Integer> impl
 			if(StringUtils.isNotEmpty(v.getCode())){
 				pro = fgProfessionalService.selectOne(professional);
 				if(pro == null){
-					proMsg = "导入的专业代码不存在";
+					proMsg = "专业代码不存在";
 				}
 			}else{
 				proMsg = "请填写专业代码";
@@ -229,7 +232,7 @@ public class FgMajorServiceImpl extends BaseModelServiceImpl<Major,Integer> impl
 				vo.setMsg(dptMsg + majorMsg + proMsg);
 			}
 			
-			String countMsg = (StringUtils.isEmpty(dptMsg) ? "" : dptMsg) + (StringUtils.isEmpty(majorMsg) ? "" : majorMsg) + (StringUtils.isEmpty(proMsg) ? "" : proMsg);
+			String countMsg = (StringUtils.isEmpty(dptMsg) ? "" : dptMsg) + " " + (StringUtils.isEmpty(majorMsg) ? "" : majorMsg) + " " +  (StringUtils.isEmpty(proMsg) ? "" : proMsg);
 			vo.setMsg(countMsg);
 			
 			if(data == null || major != null || pro == null){
@@ -256,13 +259,7 @@ public class FgMajorServiceImpl extends BaseModelServiceImpl<Major,Integer> impl
 			entity.setType(redis.getMember().getType());
 			super.insert(entity);
 		}
-		Export entity = new Export();
-		if(list != null && list.size() > 0){
-			String value = JSON.toJSONString(list);
-			entity.setValue(value);
-			entity.setClazz("com.zrqx.core.vo.schoolsysuser.fg.major.MajorErrVo");
-			exportMapper.insert(entity);
-		}
+		Export entity = exportManage.save(list, "com.zrqx.core.vo.schoolsysuser.fg.major.MajorErrVo");
 		majorVo.setList(list);
 		majorVo.setErrId(entity.getId());
 		return majorVo;

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

@@ -52,6 +52,7 @@ import com.zrqx.core.vo.schoolsysuser.fg.publiclesson.ImportLessonExcelVo;
 import com.zrqx.core.vo.schoolsysuser.fg.publiclesson.LessonErrVo;
 import com.zrqx.school.sysuser.client.BgResourceClient;
 import com.zrqx.school.sysuser.client.FgResouceClient;
+import com.zrqx.school.sysuser.manage.export.ExportManage;
 import com.zrqx.school.sysuser.mapper.basicteachingplan.FgBasicTeachingPlanMapper;
 import com.zrqx.school.sysuser.mapper.export.ExportMapper;
 import com.zrqx.school.sysuser.mapper.publiclesson.FgPublicLessonMapper;
@@ -81,7 +82,7 @@ public class FgPublicLessonServiceImpl extends BaseModelServiceImpl<PublicLesson
 	@Autowired
 	private FgBasicTeachingPlanMapper fgBasicTeachingPlanMapper;
 	@Autowired
-	private ExportMapper exportMapper;
+	private ExportManage exportManage;
 	@Autowired
 	private FgResouceClient fgResouceClient;
 	
@@ -574,13 +575,7 @@ public class FgPublicLessonServiceImpl extends BaseModelServiceImpl<PublicLesson
 				fgPublicLessonClassArrangeRealtionService.exportSave(vo, id);
 			});
 		}
-		Export entity = new Export();
-		if(list != null && list.size() > 0){
-			String value = JSON.toJSONString(list);
-			entity.setValue(value);
-			entity.setClazz("com.zrqx.core.vo.schoolsysuser.fg.publiclesson.LessonErrVo");
-			exportMapper.insert(entity);
-		}
+		Export entity = exportManage.save(list, "com.zrqx.core.vo.schoolsysuser.fg.publiclesson.LessonErrVo");
 		planVo.setList(list);
 		planVo.setErrId(entity.getId());
 		return planVo;

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

@@ -266,7 +266,7 @@ public class FgStudentServiceImpl extends BaseModelServiceImpl<Student,Integer>
 				classMsg = "导入的班级不存在";
 			}
 			
-			String countMsg = (StringUtils.isEmpty(dptMsg) ? "" : dptMsg) + (StringUtils.isEmpty(majorMsg) ? "" : majorMsg) + (StringUtils.isEmpty(planMsg) ? "" : planMsg) + (StringUtils.isEmpty(msg) ? "" : msg) + (StringUtils.isEmpty(msg1) ? "" : msg1) + (StringUtils.isEmpty(levelMsg) ? "" : levelMsg) + (StringUtils.isEmpty(classMsg) ? "" : classMsg);
+			String countMsg = (StringUtils.isEmpty(dptMsg) ? "" : dptMsg) +" "+ (StringUtils.isEmpty(majorMsg) ? "" : majorMsg) + " " +(StringUtils.isEmpty(planMsg) ? "" : planMsg) + " " + (StringUtils.isEmpty(msg) ? "" : msg) + " " + (StringUtils.isEmpty(msg1) ? "" : msg1) + " " + (StringUtils.isEmpty(levelMsg) ? "" : levelMsg) + " " + (StringUtils.isEmpty(classMsg) ? "" : classMsg);
 			vo.setMsg(countMsg);
 			
 			if(plan == null || major == null || StringUtils.isNotEmpty(msg) || StringUtils.isNotEmpty(msg1) || entity == null || departmentId == null || StringUtils.isNotEmpty(levelMsg)){
@@ -287,13 +287,6 @@ public class FgStudentServiceImpl extends BaseModelServiceImpl<Student,Integer>
 			super.insert(stu);
 		}
 		Export entity = exportManage.save(list, "com.zrqx.core.vo.schoolsysuser.fg.student.StudentVo");
-		/*Export entity = new Export();
-		if(list != null && list.size() > 0){
-			String value = JSON.toJSONString(list);
-			entity.setValue(value);
-			entity.setClazz("com.zrqx.core.vo.schoolsysuser.fg.student.StudentVo");
-			exportMapper.insert(entity);
-		}*/
 		stuVo.setList(list);
 		stuVo.setErrId(entity.getId());
 		return stuVo;