Commit 35668e1b authored by hongguangwu's avatar hongguangwu

MVP1.7.12-导出

parent 18a60fa1
......@@ -67,13 +67,13 @@ public class TGzEmpInfoExportEducation implements Serializable {
private String gradutionType;
@ExcelProperty("专业")
private String major;
@ExcelAttribute(name = "是否最高学历", isDataId = true, readConverterExp = "Y=是,N=不是")
@ExcelAttribute(name = "是否最高学历", isDataId = true, readConverterExp = "Y=是,N=")
@ExcelProperty("是否最高学历")
private String highEduQualFlag;
@ExcelAttribute(name = "是否最高学位", isDataId = true, readConverterExp = "Y=是,N=不是")
@ExcelAttribute(name = "是否最高学位", isDataId = true, readConverterExp = "Y=是,N=")
@ExcelProperty("是否最高学位")
private String highEduDegreeFlag;
@ExcelAttribute(name = "是否第一学历", isDataId = true, readConverterExp = "Y=是,N=不是")
@ExcelAttribute(name = "是否第一学历", isDataId = true, readConverterExp = "Y=是,N=")
@ExcelProperty("是否第一学历")
private String firstDegreeFlag;
......
......@@ -54,7 +54,7 @@ public class TGzEmpInfoExportFamily implements Serializable {
private String familyAddress;
@ExcelProperty("所在单位名称")
private String familyCompany;
@ExcelAttribute(name = "是否客户单位任职", isDataId = true, readConverterExp = "Y=是,N=不是")
@ExcelAttribute(name = "是否客户单位任职", isDataId = true, readConverterExp = "Y=是,N=")
@ExcelProperty("是否客户单位任职")
private String gzEmeFlag;
@ExcelProperty("职务")
......
......@@ -71,6 +71,8 @@ public class TGzEmpInfoExportMain implements Serializable {
@ExcelAttribute(name = "性别", isDataId = true, dataType = ExcelAttributeConstants.GZ_SEX)
@ExcelProperty("性别")
private String sex;
@ExcelAttribute(name = "星座", isDataId = true, dataType = ExcelAttributeConstants.GZ_CONSTEL)
@ExcelProperty("星座")
private String constel;
@ExcelProperty("血型")
......@@ -268,6 +270,8 @@ public class TGzEmpInfoExportMain implements Serializable {
@ExcelAttribute(name = "银行账户状态", isDataId = true, readConverterExp = "A=有效")
@ExcelProperty("银行账户状态")
private String accountStatus;
@ExcelAttribute(name = "银行账户国家", isDataId = true, dataType = ExcelAttributeConstants.GZ_COUNTRY)
@ExcelProperty("银行账户国家/地区")
private String accountCountry;
@ExcelAttribute(name = "银行", isDataId = true, dataType = ExcelAttributeConstants.GZ_BANK)
......
......@@ -496,10 +496,13 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
} else {
TGzOfferInfo gzOfferInfo = gzOfferInfoMapper.getInfoById(offerId);
if(gzOfferInfo == null || Common.isEmpty(gzOfferInfo) || Common.isEmpty(gzOfferInfo.getBizId())){
return R.failed("未找到瓜子Offer数据,Offer的ID="+ offerId);
return R.failed("未找到瓜子Offer数据");
// return R.failed("未找到瓜子Offer数据,Offer的ID="+ offerId)
}
if (Common.isEmpty(gzOfferInfo.getOfferStatus()) || !"9".equals(gzOfferInfo.getOfferStatus())) {
return R.failed("瓜子Offer状态不对("+gzOfferInfo.getOfferStatus()+"),不可编辑,Offer的ID="+ offerId);
return R.failed("瓜子offer状态不对,不可提交");
// 测试 郭彤:这个提示改下吧,没必要吧ID还有状态枚举值列出来 2025-6-30 18:09:05
// return R.failed("瓜子Offer状态不对("+gzOfferInfo.getOfferStatus()+"),不可编辑,Offer的ID="+ offerId)
}
gzOfferInfo.setOfferStatus("12");
gzOfferInfoMapper.updateById(gzOfferInfo);
......
......@@ -215,4 +215,6 @@ public class ExcelAttributeConstants {
public static final String GZ_INSURANCE_STA = "gz_insurance_sta";
// 瓜子的试用期
public static final String GZ_PROBATION = "gz_probation";
// 瓜子的星座
public static final String GZ_CONSTEL = "gz_constel";
}
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