MVP1.7.0 优化-清空户籍

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TPreEmployeeInfo.java

@@ -184,6 +184,7 @@ public class TPreEmployeeInfo extends BaseEntity {
 	@ExcelAttribute(name = "身份证-省")
 	@ExcelProperty("身份证-省")
 	@Schema(description = "身份证-省")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
 	private Integer idProvince;
 	/**
 	 * 身份证-市
@@ -191,6 +192,7 @@ public class TPreEmployeeInfo extends BaseEntity {
 	@ExcelAttribute(name = "身份证-市")
 	@ExcelProperty("身份证-市")
 	@Schema(description = "身份证-市")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
 	private Integer idCity;
 	/**
 	 * 身份证-县
@@ -198,6 +200,7 @@ public class TPreEmployeeInfo extends BaseEntity {
 	@ExcelAttribute(name = "身份证-县")
 	@ExcelProperty("身份证-县")
 	@Schema(description = "身份证-县")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
 	private Integer idTown;
 	/**
 	 * 户口性质

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

@@ -3431,12 +3431,18 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
 							tPreEmployeeInfo.setEmpPhone(info.getEmpPhone());
 							if (Common.isNotNull(info.getIdProvinceValue())) {
 								tPreEmployeeInfo.setIdProvince(Integer.parseInt(info.getIdProvinceValue()));
+							} else {
+								tPreEmployeeInfo.setIdProvince(null);
 							}
 							if (Common.isNotNull(info.getIdCityValue())) {
 								tPreEmployeeInfo.setIdCity(Integer.parseInt(info.getIdCityValue()));
+							} else {
+								tPreEmployeeInfo.setIdCity(null);
 							}
 							if (Common.isNotNull(info.getIdTownValue())) {
 								tPreEmployeeInfo.setIdTown(Integer.parseInt(info.getIdTownValue()));
+							} else {
+								tPreEmployeeInfo.setIdTown(null);
 							}
 							tPreEmployeeInfo.setEmpRegisType(info.getEmpRegisTypeValue());
 							if (Common.isNotNull(info.getFileProvinceValue())) {
@@ -3447,6 +3453,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
 							}
 							if (Common.isNotNull(info.getFileTownValue())) {
 								tPreEmployeeInfo.setFileTown(Integer.parseInt(info.getFileTownValue()));
+							} else {
+								tPreEmployeeInfo.setFileTown(null);
 							}
 							if (Common.isNotNull(info.getEducationNameValue())) {
 								tPreEmployeeInfo.setHignEducation(info.getEducationNameValue());
@@ -3472,6 +3480,13 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
 								tPreEmployeeInfo.setBankSubName(info.getBankSubName());
 								tPreEmployeeInfo.setBankNo(info.getBankNo());
 								tPreEmployeeInfo.setTaxMonth(info.getTaxMonthValue());
+							} else {
+								tPreEmployeeInfo.setBankName(null);
+								tPreEmployeeInfo.setBankProvince(null);
+								tPreEmployeeInfo.setBankCity(null);
+								tPreEmployeeInfo.setBankSubName(null);
+								tPreEmployeeInfo.setBankNo(null);
+								tPreEmployeeInfo.setTaxMonth(null);
 							}
 							tPreEmployeeInfo.setTaxMonthFlag(CommonConstants.ONE_STRING);
 							tPreEmployeeInfo.setContactProvince(info.getContactProvinceValue());