派单派增在专业后面加毕业时间

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/UpProjectSocialFundVo.java

 package com.yifu.cloud.plus.v1.yifu.archives.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
 import com.alibaba.excel.annotation.write.style.HeadFontStyle;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Author fxj
@@ -68,6 +73,12 @@ public class UpProjectSocialFundVo implements Serializable {
 	 */
 	@Schema(description = "专业" )
 	private String major;
+
+	/**
+	 * 毕业时间
+	 */
+	@Schema(description = "毕业时间")
+	private Date gradutionDate;
 	// 是否更新学历标识
 	String flag;
 }

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java

@@ -1425,6 +1425,9 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 					employee.setMajor(vo.getMajor());
 				}
 			}
+			if (Common.isNotNull(vo.getGradutionDate())){
+				employee.setGradutionDate(vo.getGradutionDate());
+			}
 			tEmployeeInfoMapper.updateSocialInfoById(employee);
 		}
 		TEmployeeProject project = baseMapper.selectOne(Wrappers.<TEmployeeProject>query().lambda()

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml

@@ -1142,6 +1142,7 @@
 			<if test="tEmployeeInfo.hignEducation != null">HIGN_EDUCATION=#{tEmployeeInfo.hignEducation},</if>
 			<if test="tEmployeeInfo.school != null">SCHOOL=#{tEmployeeInfo.school},</if>
 			<if test="tEmployeeInfo.major != null">MAJOR=#{tEmployeeInfo.major},</if>
+			<if test="tEmployeeInfo.gradutionDate != null">GRADUTION_DATE=#{tEmployeeInfo.gradutionDate},</if>
 			<if test="tEmployeeInfo.contactAddress != null">CONTACT_ADDRESS=#{tEmployeeInfo.contactAddress},</if>
 			<if test="tEmployeeInfo.isCollege != null">IS_COLLEGE='1',</if>
 			<if test="tEmployeeInfo.fileProvince != null">a.FILE_PROVINCE=#{tEmployeeInfo.fileProvince},</if>

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TDispatchInfo.java

@@ -646,6 +646,15 @@ public class TDispatchInfo extends BaseEntity {
 	@ExcelProperty(value ="专业")
 	private String major;
 
+	/**
+	 * 毕业时间
+	 */
+	@ExcelAttribute(name = "毕业时间", isDate = true)
+	@Schema(description = "毕业时间" )
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("毕业时间" )
+	private Date graduationTime;
+
 	/**
 	 * 首次至缴纳地时间
 	 */

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

@@ -458,6 +458,16 @@ public class SocialHandleExportVo implements Serializable {
 	@ExcelProperty(value ="专业")
 	private String major;
 
+	/**
+	 * 毕业时间
+	 */
+	@DateTimeFormat("yyyy-MM-dd")
+	@ExcelAttribute(name = "毕业时间", isDate = true)
+	@Schema(description = "毕业时间" )
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("毕业时间" )
+	private Date graduationTime;
+
 	/**
 	 * 首次至缴纳地时间
 	 */

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

@@ -375,6 +375,16 @@ public class TDispatchAuditExportVo {
 	@ExcelProperty(value ="专业")
 	private String major;
 
+	/**
+	 * 毕业时间
+	 */
+	@DateTimeFormat("yyyy-MM-dd")
+	@ExcelAttribute(name = "毕业时间", isDate = true)
+	@Schema(description = "毕业时间" )
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("毕业时间" )
+	private Date graduationTime;
+
 	/**
 	 * 首次至缴纳地时间
 	 */

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

@@ -290,6 +290,15 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
 	@ExcelProperty(value ="学校")
 	private String schoolName;
 
+	/**
+	 * 毕业时间
+	 */
+	@ExcelAttribute(name = "毕业时间", isDate = true)
+	@Schema(description = "毕业时间" )
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("毕业时间" )
+	private Date graduationTime;
+
 	/**
 	 * 专业
 	 */

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

@@ -501,6 +501,16 @@ public class TDispatchInfoExportVo {
 	@ExcelProperty(value ="专业")
 	private String major;
 
+	/**
+	 * 毕业时间
+	 */
+	@DateTimeFormat("yyyy-MM-dd")
+	@ExcelAttribute(name = "毕业时间", isDate = true)
+	@Schema(description = "毕业时间" )
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("毕业时间" )
+	private Date graduationTime;
+
 	/**
 	 * 首次至缴纳地时间
 	 */

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

@@ -852,6 +852,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 					if (Common.isNotNull(excel.getMajor())){
 						vo.setMajor(excel.getMajor());
 					}
+					if (Common.isNotNull(excel.getGraduationTime())){
+						vo.setGradutionDate(excel.getGraduationTime());
+					}
 				}
 			}
 		}
@@ -1326,6 +1329,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		dispatch.setEducationName(excel.getEducationName());
 		dispatch.setSchoolName(excel.getSchoolName());
 		dispatch.setMajor(excel.getMajor());
+		dispatch.setGraduationTime(excel.getGraduationTime());
 		dispatch.setFirstPayTime(excel.getFirstPayTime());
 		dispatch.setIdCardProvince(excel.getIdCardProvince());
 		dispatch.setIdCardCity(excel.getIdCardCity());
@@ -2134,6 +2138,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		emp.setEmpRegisType(excel.getEmpRegisType());
 		emp.setHignEducation(excel.getEducationName());
 		emp.setMajor(excel.getMajor());
+		emp.setGradutionDate(excel.getGraduationTime());
 		emp.setSchool(excel.getSchoolName());
 		emp.setContractStatus(CommonConstants.ZERO_INT);
 		emp.setDeleteFlag(CommonConstants.ZERO_STRING);

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

@@ -102,6 +102,7 @@
 	  <result property="schoolName" column="SCHOOL_NAME"/>
 	  <result property="major" column="MAJOR"/>
 	  <result property="firstPayTime" column="FIRST_PAY_TIME"/>
+	  <result property="graduationTime" column="GRADUATION_TIME"/>
 
   </resultMap>
 	<resultMap id="dispatchPageMap" type="com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoPageVo" extends="tDispatchInfoMap">
@@ -172,6 +173,7 @@
 		<result property="schoolName" column="SCHOOL_NAME"/>
 		<result property="major" column="MAJOR"/>
 		<result property="firstPayTime" column="FIRST_PAY_TIME"/>
+		<result property="graduationTime" column="GRADUATION_TIME"/>
 	</resultMap>
 
 	<resultMap id="fundSupplementaryMap" type="com.yifu.cloud.plus.v1.yifu.social.vo.FundSupplementaryExportVo">
@@ -341,6 +343,7 @@
 		<result property="schoolName" column="SCHOOL_NAME"/>
 		<result property="major" column="MAJOR"/>
 		<result property="firstPayTime" column="FIRST_PAY_TIME"/>
+		<result property="graduationTime" column="GRADUATION_TIME"/>
 	</resultMap>
 
     <sql id="Base_Column_List">
@@ -420,7 +423,8 @@
 		a.ORDER_ID,
 		a.SCHOOL_NAME,
 		a.MAJOR,
-		a.FIRST_PAY_TIME
+		a.FIRST_PAY_TIME,
+		a.GRADUATION_TIME
     </sql>
     <sql id="tDispatchInfo_where">
         <if test="tDispatchInfo != null">
@@ -955,7 +959,8 @@
 		a.EDUCATION_NAME,
 		a.SCHOOL_NAME,
 		a.MAJOR,
-		a.FIRST_PAY_TIME
+		a.FIRST_PAY_TIME,
+		a.GRADUATION_TIME
 
 		from t_dispatch_info a
 		left join t_social_info s on s.id=a.SOCIAL_ID
@@ -1016,7 +1021,8 @@
 		a.EDUCATION_NAME,
 		a.SCHOOL_NAME,
 	    a.MAJOR,
-	    a.FIRST_PAY_TIME
+	    a.FIRST_PAY_TIME,
+		a.GRADUATION_TIME
 		from t_dispatch_info a
 		left join t_social_info b on a.SOCIAL_ID = b.ID
 		left join t_provident_fund c on a.FUND_ID = C.ID
@@ -1103,6 +1109,7 @@
 		<result property="schoolName" column="SCHOOL_NAME"/>
 		<result property="major" column="MAJOR"/>
 		<result property="firstPayTime" column="FIRST_PAY_TIME"/>
+		<result property="graduationTime" column="GRADUATION_TIME"/>
 	</resultMap>
 
 	<resultMap id="fundHandleMap" type="com.yifu.cloud.plus.v1.yifu.social.vo.FundHandleExportVo">
@@ -1191,7 +1198,8 @@
 		'1'  as EXPORT_SOCIAL_FLAG,
 		a.SCHOOL_NAME,
 		a.MAJOR,
-		a.FIRST_PAY_TIME
+		a.FIRST_PAY_TIME,
+		a.GRADUATION_TIME
 		FROM t_dispatch_info a
 		left join t_social_info s on a.SOCIAL_ID = s.id
 		<include refid="where_getSocialRecordRoster"/>