Commit 555f5b8b authored by huyuchen's avatar huyuchen

huych-入职登记商险待办提交

parent 5a787223
...@@ -687,7 +687,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -687,7 +687,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
private void initInsurancePreInfo(EmployeeRegistrationPre registration, TEmployeeInsurancePre preVo, private void initInsurancePreInfo(EmployeeRegistrationPre registration, TEmployeeInsurancePre preVo,
YifuUser user, String id) { YifuUser user, String id) {
preVo.setRegisterId(id); preVo.setRegisterId(id);
preVo.setCustomerUsername(registration.getCustomerUsername()); preVo.setCustomerUsername(registration.getCustomerUsernameNew());
preVo.setCustomerUserLoginname(registration.getCustomerUserLoginname()); preVo.setCustomerUserLoginname(registration.getCustomerUserLoginname());
preVo.setDeptName(registration.getDeptName()); preVo.setDeptName(registration.getDeptName());
preVo.setDeptId(registration.getDeptId()); preVo.setDeptId(registration.getDeptId());
......
...@@ -1205,7 +1205,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -1205,7 +1205,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
private void initRegistPreInfo(EmployeeRegistration registration,EmployeeRegistrationPreVo preVo, private void initRegistPreInfo(EmployeeRegistration registration,EmployeeRegistrationPreVo preVo,
YifuUser user,String status) throws ParseException { YifuUser user,String status) throws ParseException {
preVo.setId(registration.getId()); preVo.setId(registration.getId());
preVo.setCustomerUsername(registration.getCustomerUsername()); preVo.setCustomerUsername(registration.getCustomerUsernameNew());
preVo.setCustomerUserLoginname(registration.getCustomerUserLoginname()); preVo.setCustomerUserLoginname(registration.getCustomerUserLoginname());
preVo.setDeptName(registration.getDeptName()); preVo.setDeptName(registration.getDeptName());
preVo.setDeptId(registration.getDeptId()); preVo.setDeptId(registration.getDeptId());
...@@ -1215,7 +1215,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -1215,7 +1215,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
preVo.setConfirmTime(DateUtil.getCurrentDateTime()); preVo.setConfirmTime(DateUtil.getCurrentDateTime());
preVo.setDeptNo(registration.getDeptNo()); preVo.setDeptNo(registration.getDeptNo());
preVo.setConfirmUser(user.getNickname()); preVo.setConfirmUser(user.getNickname());
preVo.setCustomerUsernameNew(registration.getCustomerUsername()); preVo.setCustomerUsernameNew(registration.getCustomerUsernameNew());
preVo.setEmpPhone(registration.getEmpPhone()); preVo.setEmpPhone(registration.getEmpPhone());
preVo.setEmployeeName(registration.getEmployeeName()); preVo.setEmployeeName(registration.getEmployeeName());
preVo.setEmpIdcard(registration.getEmpIdcard()); preVo.setEmpIdcard(registration.getEmpIdcard());
...@@ -1233,7 +1233,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -1233,7 +1233,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
private void initInsruancePreInfo(EmployeeRegistration registration,TEmployeeInsurancePreVo preVo, private void initInsruancePreInfo(EmployeeRegistration registration,TEmployeeInsurancePreVo preVo,
YifuUser user,String id) throws ParseException { YifuUser user,String id) throws ParseException {
preVo.setRegisterId(id); preVo.setRegisterId(id);
preVo.setCustomerUsername(registration.getCustomerUsername()); preVo.setCustomerUsername(registration.getCustomerUsernameNew());
preVo.setCustomerUserLoginname(registration.getCustomerUserLoginname()); preVo.setCustomerUserLoginname(registration.getCustomerUserLoginname());
preVo.setDeptName(registration.getDeptName()); preVo.setDeptName(registration.getDeptName());
preVo.setDeptId(registration.getDeptId()); preVo.setDeptId(registration.getDeptId());
......
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