Commit d85f2fae authored by fangxinjiang's avatar fangxinjiang

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

parents e3566c79 5c1fcae8
...@@ -531,7 +531,7 @@ public class EmployeeProjectExportVO { ...@@ -531,7 +531,7 @@ public class EmployeeProjectExportVO {
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value = "档案是否完整") @ExcelProperty(value = "档案是否完整")
@ExcelAttribute(name = "档案是否完整", readConverterExp = "0=是,1=否") @ExcelAttribute(name = "档案是否完整", isDataId = true , readConverterExp = "0=是,1=否")
private String isComplete; private String isComplete;
private String[] socialStatusArray; private String[] socialStatusArray;
......
...@@ -3800,6 +3800,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -3800,6 +3800,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tPreEmployeeInfo.setBankSubName(info.getBankSubName()); tPreEmployeeInfo.setBankSubName(info.getBankSubName());
tPreEmployeeInfo.setBankNo(info.getBankNo()); tPreEmployeeInfo.setBankNo(info.getBankNo());
tPreEmployeeInfo.setTaxMonth(info.getTaxMonthValue()); tPreEmployeeInfo.setTaxMonth(info.getTaxMonthValue());
} else {
} }
tPreEmployeeInfo.setTaxMonthFlag(CommonConstants.ONE_STRING); tPreEmployeeInfo.setTaxMonthFlag(CommonConstants.ONE_STRING);
tPreEmployeeInfo.setContactProvince(info.getContactProvinceValue()); tPreEmployeeInfo.setContactProvince(info.getContactProvinceValue());
......
...@@ -178,7 +178,8 @@ ...@@ -178,7 +178,8 @@
a.SOCIAL_CITY, a.SOCIAL_CITY,
a.SOCIAL_TOWN, a.SOCIAL_TOWN,
a.SALARY_STATUS, a.SALARY_STATUS,
a.EMP_LABEL a.EMP_LABEL,
a.IS_COMPLETE
</sql> </sql>
<sql id="Base_Export_List"> <sql id="Base_Export_List">
......
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