You need to sign in or sign up before continuing.
Commit f1407af4 authored by huyuchen's avatar huyuchen

huych-入职确认信息编辑提交

parent 8e2e30de
......@@ -1032,7 +1032,8 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
R<EkpDeptContractInfoVo> info = ekpDaprUtils.selectContractInfoByDetptNo(infoVo);
if (Common.isNotNull(info) && Common.isNotNull(info.getData())) {
EkpDeptContractInfoVo returnVo = info.getData();
employeeContractPreVo.setContractEnd(returnVo.getContractEndTime());
employeeContractPreVo.setContractEnd(null != returnVo.getContractEndTime() ?
DateUtil.stringToDate(returnVo.getContractEndTime()) : null);
} else {
employeeContractPreVo.setContractEnd(null);
}
......
......@@ -21,7 +21,7 @@ public class EkpDeptContractInfoVo implements Serializable {
/**
* 合同截至日期
**/
private Date contractEndTime;
private String contractEndTime;
/**
* 项目编码
**/
......
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