权限批量导入

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchAuditExportVo.java

@@ -350,6 +350,12 @@ public class TDispatchAuditExportVo {
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("个人公积金缴纳比例" )
 	private BigDecimal personalProvidentPer;
+
+	@ExcelAttribute(name = "学历", maxLength = 32)
+	@Schema(description = "学历", name = "contractName")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("学历")
+	private String educationName;
 	/**
 	 * 学校
 	 */

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchInfoExportVo.java

@@ -477,6 +477,11 @@ public class TDispatchInfoExportVo {
 	@ExcelProperty("公积金办理备注" )
 	private String fundHandleRemark;
 
+	@ExcelAttribute(name = "学历", maxLength = 32)
+	@Schema(description = "学历", name = "contractName")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("学历")
+	private String educationName;
 	/**
 	 * 学校
 	 */
@@ -486,6 +491,7 @@ public class TDispatchInfoExportVo {
 	@ExcelProperty(value ="学校")
 	private String schoolName;
 
+
 	/**
 	 * 专业
 	 */

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java

@@ -812,6 +812,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			}
 			if(Common.isNotNull(emp)) {
 				if (Common.isEmpty(emp.getHignEducation())) {
+					vo.setHighEducation("");
 					if (excel.getEducationName().equals("文盲")) {
 						vo.setHighEducation("1");
 					}
@@ -845,9 +846,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 					if (excel.getEducationName().equals("中专")) {
 						vo.setHighEducation("11");
 					}
-					else {
-						vo.setHighEducation("");
-					}
 					if (Common.isNotNull(excel.getSchoolName())){
 						vo.setSchoolName(excel.getSchoolName());
 					}

yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml

@@ -168,6 +168,7 @@
 		<result property="unitBirthCardinal" column="UNIT_BIRTH_CARDINAL"/>
 		<result property="empMobile" column="EMP_MOBILE"/>
 
+		<result property="educationName" column="EDUCATION_NAME"/>
 		<result property="schoolName" column="SCHOOL_NAME"/>
 		<result property="major" column="MAJOR"/>
 		<result property="firstPayTime" column="FIRST_PAY_TIME"/>
@@ -336,6 +337,7 @@
 		<result property="unitProvidentPer" column="UNIT_PROVIDENT_PER"/>
 		<result property="personalProvidentPer" column="PERSONAL_PROVIDENT_PER"/>
 
+		<result property="educationName" column="EDUCATION_NAME"/>
 		<result property="schoolName" column="SCHOOL_NAME"/>
 		<result property="major" column="MAJOR"/>
 		<result property="firstPayTime" column="FIRST_PAY_TIME"/>
@@ -950,6 +952,7 @@
 		c.UNIT_PROVIDENG_CARDINAL,
 		c.UNIT_PROVIDENT_PER,
 		a.EMP_MOBILE,
+		a.EDUCATION_NAME,
 		a.SCHOOL_NAME,
 		a.MAJOR,
 		a.FIRST_PAY_TIME
@@ -1010,6 +1013,7 @@
 		c.PERSONAL_PROVIDENT_CARDINAL,
 		c.UNIT_PROVIDENT_PER,
 		c.PERSONAL_PROVIDENT_PER,
+		a.EDUCATION_NAME,
 		a.SCHOOL_NAME,
 	    a.MAJOR,
 	    a.FIRST_PAY_TIME