MVP1.7.0 更新附件

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

@@ -146,7 +146,7 @@ public class PreUploadEmpImportVo implements Serializable {
 	// private List<TPreEmpFamily> tpreEmpFamilyList
 	@ExcelAttribute(name = "成员姓名", maxLength = 32)
 	private String familyName;
-	@ExcelAttribute(name = "与本人关系", isMark = true, maxLength = 32)
+	@ExcelAttribute(name = "与本人关系", isMark = true,isDataId = true,dataType = ExcelAttributeConstants.FAMILY_RELATION, maxLength = 32)
 	private String relationshipSelf;
 	@ExcelAttribute(name = "手机号码（家庭成员）", isMark = true, isPhone = true, maxLength = 32)
 	private String contractTel;
@@ -258,6 +258,8 @@ public class PreUploadEmpImportVo implements Serializable {
 	// 预入职-员工工作履历信息表
 	@ExcelAttribute(name = "是否为首份工作")
 	private String firstWorkFlagValue;
+	@ExcelAttribute(name = "与本人关系")
+	private String relationshipSelfValue;
 	// 预入职-员工职业资格信息表
 	@ExcelAttribute(name = "是否有职业资格证书")
 	private String haveQualificationValue;

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

@@ -566,7 +566,7 @@
 		</foreach>
 	</delete>
 	<delete id="deleteContactByMainIdList">
-		delete from t_pre_emp_contact_info where PRE_MAIN_ID = in
+		delete from t_pre_emp_contact_info where PRE_MAIN_ID in
 		<foreach collection="preMainIdList" item="ids" open="(" separator="," close=")">
 			#{ids}
 		</foreach>