Commit 44386555 authored by huyuchen's avatar huyuchen

Merge remote-tracking branch 'origin/MVP1.7.12' into MVP1.7.12

parents 2dbea99b 511656cc
......@@ -116,7 +116,7 @@ public class TGzEmpInfoExportMain implements Serializable {
@ExcelProperty("驾照失效日期")
private String driverLicenExp;
@ExcelAttribute(name = "是否新参社保", isDataId = true, readConverterExp = "Y=是,N=否")
@ExcelAttribute(name = "是否新参社保", isDataId = true, dataType = ExcelAttributeConstants.GZ_INSURANCE_STA)
@ExcelProperty("是否新参社保")
private String insuranceSta;
......@@ -146,6 +146,7 @@ public class TGzEmpInfoExportMain implements Serializable {
@ExcelProperty("个人邮箱")
private String mail;
@ExcelAttribute(name = "地址类型", isDataId = true, dataType = ExcelAttributeConstants.GZ_ADDRESS_TYPE)
@ExcelProperty("地址类型")
private String addressType;
......
......@@ -3712,6 +3712,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
if (Common.isNotNull(detail.getValidityStart())
&& Common.isNotNull(detail.getValidityEnd())
&& !"长期".equals(detail.getValidityEnd())
&& DateUtil.checkStringToDate(detail.getValidityEnd(), DateUtil.ISO_EXPANDED_DATE_FORMAT)
&& !DateUtil.stringToDate(detail.getValidityEnd(),DateUtil.ISO_EXPANDED_DATE_FORMAT)
.after(DateUtil.stringToDate(detail.getValidityStart(),DateUtil.ISO_EXPANDED_DATE_FORMAT))){
detail.setErrorInfo(EmployeeConstants.EMP_VALIDITY_END_START_DATE);
......
......@@ -207,4 +207,8 @@ public class ExcelAttributeConstants {
public static final String GZ_GRADUATE_TYPE = "gz_graduate_type";
// 瓜子的家庭成员-与成员关系
public static final String GZ_FAMILY_RELATION = "gz_family_relation";
// 瓜子的地址类型
public static final String GZ_ADDRESS_TYPE = "gz_address_type";
// 瓜子的是否新参社保
public static final String GZ_INSURANCE_STA = "gz_insurance_sta";
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment