--no commit message

com.zrqx.bg.resource/src/main/java/com/zrqx/bg/resource/manage/goods/eleresource/EleResourceManage.java

@@ -22,6 +22,7 @@ import com.zrqx.bg.resource.manage.goods.phyresource.PhyResourceManage;
 import com.zrqx.bg.resource.manage.label.LabelManage;
 import com.zrqx.bg.resource.manage.resource.ResourceStatusManage;
 import com.zrqx.bg.resource.mapper.goods.eleresource.EleResourceMapper;
+import com.zrqx.core.commons.redis.BgRedisManage;
 import com.zrqx.core.commons.redis.Redis;
 import com.zrqx.core.enums.resource.goods.GoodsStatusEnum;
 import com.zrqx.core.enums.resource.goods.GoodsTypeEnum;
@@ -45,11 +46,9 @@ public class EleResourceManage {
 	@Autowired
 	private LabelManage labelManage;
 	@Autowired
-	private ResourceStatusManage statusManage;
-	@Autowired
 	private PhyResourceManage phyResourceManage;
 	@Autowired
-	private Redis redis;
+	private BgRedisManage redis;
 	
 	public boolean save(EleResourceForm form) {
 		EleResource eleResource = new EleResource();

com.zrqx.core/src/main/java/com/zrqx/core/vo/schoolsysuser/fg/classmanagement/ClassmanagementErrVo.java

+package com.zrqx.core.vo.schoolsysuser.fg.classmanagement;
+
+import com.zrqx.core.util.excelutil.ExcelResources;
+import com.zrqx.core.util.excelutil.ExcelSheetParams;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@Data
+@ExcelSheetParams(startRow = 2)
+@ApiModel(value = "ClassmanagementErrVo",description = "班级错误信息列表vo")
+public class ClassmanagementErrVo {
+
+	@ExcelResources(title="学级")
+	private Integer academicLevel;
+	@ExcelResources(title="部门名称")
+	private String departmentName;
+	@ExcelResources(title="专业名称")
+	private String majorName;
+	@ExcelResources(title="培养层次")
+	private String planName;
+	@ExcelResources(title="班级名称")
+	private String name;
+	@ExcelResources(title="人数")
+	private String num;
+	@ExcelResources(title="入学时间")
+	private String enrollmentTime;
+	@ExcelResources(title="错误信息")
+	private String msg;
+
+}

com.zrqx.core/src/main/java/com/zrqx/core/vo/schoolsysuser/fg/classmanagement/ExportClassErrVo.java

+package com.zrqx.core.vo.schoolsysuser.fg.classmanagement;
+
+
+
+import java.util.List;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "ExportClassErrVo",description = "班级错误信息导出vo")
+public class ExportClassErrVo {
+
+	@ApiModelProperty("错误信息id")
+	private Integer errId;
+	@ApiModelProperty("错误信息集合")
+	private List<ClassmanagementErrVo> list;
+
+}

com.zrqx.core/src/main/java/com/zrqx/core/vo/schoolsysuser/fg/classmanagement/ImportClassVo.java

@@ -13,17 +13,19 @@ import lombok.Data;
 @ExcelSheetParams(startRow = 2)
 public class ImportClassVo {
 
-	@ExcelResources(title="学级",order=1)
+	@ExcelResources(title="学级")
 	private Integer academicLevel;
-	@ExcelResources(title="部门名称",order=2)
+	@ExcelResources(title="部门名称")
 	private String departmentName;
-	@ExcelResources(title="专业名称",order=3)
+	@ExcelResources(title="专业名称")
 	private String majorName;
-	@ExcelResources(title="生源",order=4)
-	private String studentSource;
-	@ExcelResources(title="班级名称",order=5)
+	@ExcelResources(title="培养层次")
+	private String planName;
+	@ExcelResources(title="班级名称")
 	private String name;
-	@ExcelResources(title="人数",order=5)
+	@ExcelResources(title="人数")
 	private String num;
+	@ExcelResources(title="入学时间")
+	private String enrollmentTime;
 	
 }

com.zrqx.core/src/main/java/com/zrqx/core/vo/schoolsysuser/fg/student/StudentVo.java

@@ -9,7 +9,7 @@ import lombok.Data;
 
 @Data
 @ExcelSheetParams(startRow = 2)
-@ApiModel(value = "StudentVo",description = "学生列表vo")
+@ApiModel(value = "StudentVo",description = "学生错误信息列表vo")
 public class StudentVo{
 	
 	

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/controller/major/FgMajorController.java

@@ -16,7 +16,6 @@ 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.major.FgQueryMajorForm;
-import com.zrqx.core.model.member.classmanagement.ClassManagement;
 import com.zrqx.core.model.member.major.Major;
 import com.zrqx.core.util.bean.BeanUtils;
 import com.zrqx.core.util.datatype.ArrayUtils;

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

@@ -78,6 +78,7 @@ public class FgBasicTeachingPlanServiceImpl extends BaseModelServiceImpl<BasicTe
 		Date date = this.getDate(str);
 		form.setGraduationTime(date);
 		Major major = fgMajorService.selectByPrimaryKey(form.getMajorId());
+		form.setName(major.getName()+"(" + form.getStudentResource() + ")" + form.getEducationalSystem() + "年");
 		form.setCode(major.getCode());
 		//根据专业code值查询职业资格
 		Professional entity = new Professional();
@@ -112,6 +113,8 @@ public class FgBasicTeachingPlanServiceImpl extends BaseModelServiceImpl<BasicTe
 	}
 	@Override
 	public boolean update(BasicTeachingPlan form) {
+		Major major = fgMajorService.selectByPrimaryKey(form.getMajorId());
+		form.setName(major.getName()+"(" + form.getStudentResource() + ")" + form.getEducationalSystem() + "年");
 		BasicTeachingPlan entity = super.notNull(form.getId());
 		Integer count = form.getAcademicLevel() + form.getEducationalSystem();
 		String str = count+"-07-01";

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

@@ -81,5 +81,14 @@ public interface FgClassManagementService extends BaseService<ClassManagement,In
 	 */
 	List<ImportClassVo> importClass(MultipartFile file) throws Exception;
 	
+	 /**
+	  * 验证班级名称
+	 * @param form
+	 * @return
+	 * @author zzg
+	 * @date: 2019年7月25日 下午5:10:31
+	 */
+	String isExistClassName(ClassManagement form);
+	
 
 }

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

@@ -28,8 +28,11 @@ 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.schoolsysuser.fg.classmanagement.ClassManagementVo;
+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.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.mapper.basicteachingplan.FgBasicTeachingPlanMapper;
 import com.zrqx.school.sysuser.mapper.classmanagement.FgClassManagementMapper;
@@ -137,6 +140,9 @@ public class FgClassManagementServiceImpl extends BaseModelServiceImpl<ClassMana
 	public List<ImportClassVo> importClass(MultipartFile file) throws Exception {
 		// 导入Excel出库单vo集合
 		List<ImportClassVo> importExcelVos = new ArrayList<ImportClassVo>();
+		//导入失败的班级信息
+		List<ClassmanagementErrVo> list = new ArrayList<ClassmanagementErrVo>();
+		ExportClassErrVo classVo = new ExportClassErrVo();
 		// 解析Excel文件
 		try {
 			importExcelVos = ExcelUtil.importExcel(file.getInputStream(),
@@ -151,12 +157,13 @@ public class FgClassManagementServiceImpl extends BaseModelServiceImpl<ClassMana
 		}
 		//插入数据
 		for(ImportClassVo v : importExcelVos){
-			if(v.getAcademicLevel() == null || StringUtils.isEmpty(v.getDepartmentName()) || StringUtils.isEmpty(v.getMajorName()) || StringUtils.isEmpty(v.getName()) || StringUtils.isEmpty(v.getNum()) || StringUtils.isEmpty(v.getStudentSource())){
-				throw new BusinessValidateException("请将文件补充完整后再进行导入"); 
+			ClassmanagementErrVo vo = BeanUtils.copy(v, ClassmanagementErrVo.class);
+			if(v.getAcademicLevel() == null || StringUtils.isEmpty(v.getDepartmentName()) || StringUtils.isEmpty(v.getMajorName()) || StringUtils.isEmpty(v.getName()) || StringUtils.isEmpty(v.getNum()) || StringUtils.isEmpty(v.getPlanName())){
+				vo.setMsg("每个字段都为必填项");
 			}
 			ClassManagement entity = BeanUtils.copy(v, ClassManagement.class);
 			//验证班级名称
-			this.isExistName(entity,null);
+			String msg = this.isExistClassName(entity);
 			//验证导入的部门是否存在
 			QueryTypeAndRelationIdForm form = new QueryTypeAndRelationIdForm();
 			form.setRelationId(redis.getMember().getRelationId());
@@ -181,6 +188,20 @@ public class FgClassManagementServiceImpl extends BaseModelServiceImpl<ClassMana
 		
 	}
 
+	@Override
+	public String isExistClassName(ClassManagement form) {
+		ClassManagement s = new ClassManagement();
+		s.setName(form.getName());
+		s.setRelationId(redis.getMember().getRelationId());
+		s.setType(redis.getMember().getType());
+		Integer count = fgClassManagementMapper.selectCount(s);
+		if(count > 0){
+			log.info("FgClassManagementServiceImpl#isExistName name: "+ form.getName()  +"班级名称已存在");
+			return "班级名称: "+ form.getName()  +"班级名称已存在";
+		}
+		return null;
+	}
+