Commit b4e4016f authored by chenyuxi's avatar chenyuxi

feat: 职业资格

parent ee744a58
...@@ -3990,8 +3990,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -3990,8 +3990,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
} }
// 职业资格信息——职业资格证书 // 职业资格信息——职业资格证书
// mvp1.7.6-chenyuxi: 是否有职业资格证书都存 if (Common.isNotNull(info.getHaveQualification())
if (Common.isNotNull(info.getHaveQualification())) { && CommonConstants.IS_TRUE.equals(main.getHaveQualification())
&& CommonConstants.IS_TRUE.equals(info.getHaveQualification())) {
tPreEmpProfessionalQualification = new TPreEmpProfessionalQualification(); tPreEmpProfessionalQualification = new TPreEmpProfessionalQualification();
tPreEmpProfessionalQualification.setPreMainId(mainId); tPreEmpProfessionalQualification.setPreMainId(mainId);
tPreEmpProfessionalQualification.setSettleDomain(deptId); tPreEmpProfessionalQualification.setSettleDomain(deptId);
...@@ -4004,18 +4005,11 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -4004,18 +4005,11 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tPreEmpProfessionalQualification.setCreateBy(user.getId()); tPreEmpProfessionalQualification.setCreateBy(user.getId());
tPreEmpProfessionalQualification.setCreateName(user.getNickname()); tPreEmpProfessionalQualification.setCreateName(user.getNickname());
tPreEmpProfessionalQualification.setCreateTime(LocalDateTime.now()); tPreEmpProfessionalQualification.setCreateTime(LocalDateTime.now());
// 是否有职业资格证书 申报年度 职业资格名称
// mvp1.7.6-chenyuxi: tPreEmpProfessionalQualification.setDeclareYear(info.getDeclareYearValue());
// 先默认没有职业资格证书 tPreEmpProfessionalQualification.setQualificationType(info.getQualificationTypeValue());
tPreEmpProfessionalQualification.setHaveQualification(CommonConstants.ONE_STRING); // mvp1.7.6-chenyuxi:增加标识
tPreEmpProfessionalQualification.setHaveQualification(CommonConstants.ZERO_STRING);
if (CommonConstants.IS_TRUE.equals(main.getHaveQualification())
&& CommonConstants.IS_TRUE.equals(info.getHaveQualification())) {
// 有职业资格证书 申报年度 职业资格名称
tPreEmpProfessionalQualification.setDeclareYear(info.getDeclareYearValue());
tPreEmpProfessionalQualification.setQualificationType(info.getQualificationTypeValue());
tPreEmpProfessionalQualification.setHaveQualification(CommonConstants.ZERO_STRING);
}
preEmpProfessionalQualificationList.add(tPreEmpProfessionalQualification); preEmpProfessionalQualificationList.add(tPreEmpProfessionalQualification);
} }
} }
......
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