Commit 0f613045 authored by huyuchen's avatar huyuchen

huych-社保自动化相关提交

parent 26dd64cc
...@@ -583,13 +583,15 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T ...@@ -583,13 +583,15 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
EmployeeRegistrationCustomerUserUpdateVo updateVo = new EmployeeRegistrationCustomerUserUpdateVo(); EmployeeRegistrationCustomerUserUpdateVo updateVo = new EmployeeRegistrationCustomerUserUpdateVo();
updateVo.setDeptNo(vo.getDepartNo()); updateVo.setDeptNo(vo.getDepartNo());
updateVo.setCustomerUserName(vo.getName()); updateVo.setCustomerUserName(vo.getName());
updateVo.setCustomerUserLoginName(vo.getLoginName());
cspDaprUtils.updateRegistCustomerUserInfo(updateVo); cspDaprUtils.updateRegistCustomerUserInfo(updateVo);
LambdaUpdateWrapper<EmployeeRegistrationPre> updateWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<EmployeeRegistrationPre> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(EmployeeRegistrationPre::getDeptNo,vo.getDepartNo()) updateWrapper.eq(EmployeeRegistrationPre::getDeptNo,vo.getDepartNo())
.set(EmployeeRegistrationPre::getCustomerUserLoginname, vo.getLoginName())
.set(EmployeeRegistrationPre::getCustomerUsername, vo.getName())
.set(EmployeeRegistrationPre::getCustomerUsernameNew, vo.getName()); .set(EmployeeRegistrationPre::getCustomerUsernameNew, vo.getName());
registrationPreService.update(updateWrapper); registrationPreService.update(updateWrapper);
//更新商险待购买的前端客服 //更新商险待购买的前端客服
updateVo.setCustomerUserLoginName(vo.getLoginName());
insuranceDaprUtil.updateInsurancePreCustomerName(updateVo); insuranceDaprUtil.updateInsurancePreCustomerName(updateVo);
//更新合同待申请的前端客服 //更新合同待申请的前端客服
LambdaUpdateWrapper<TEmployeeContractPre> updateContractWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<TEmployeeContractPre> updateContractWrapper = new LambdaUpdateWrapper<>();
......
...@@ -97,6 +97,9 @@ public class EmployeeRegistration extends BaseEntity { ...@@ -97,6 +97,9 @@ public class EmployeeRegistration extends BaseEntity {
@Schema(description = "最新的客服名称") @Schema(description = "最新的客服名称")
private String customerUsernameNew; private String customerUsernameNew;
@Schema(description = "最新的客服登录名")
private String customerUserLoginNameNew;
@Schema(description = "入职登记人数") @Schema(description = "入职登记人数")
@TableField(exist = false) @TableField(exist = false)
private int inNum; private int inNum;
......
...@@ -742,7 +742,8 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -742,7 +742,8 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
// 设置客户用户名 // 设置客户用户名
employeeContractPreVo.setCustomerUsername(registration.getCustomerUsernameNew()); employeeContractPreVo.setCustomerUsername(registration.getCustomerUsernameNew());
// 设置客户用户登录名 // 设置客户用户登录名
employeeContractPreVo.setCustomerUserLoginname(registration.getCustomerUserLoginname()); employeeContractPreVo.setCustomerUserLoginname(null != registration.getCustomerUserLoginNameNew()
? registration.getCustomerUserLoginNameNew() : registration.getCustomerUserLoginname());
// 设置部门名称 // 设置部门名称
employeeContractPreVo.setDeptName(registration.getDeptName()); employeeContractPreVo.setDeptName(registration.getDeptName());
// 设置部门ID // 设置部门ID
...@@ -1087,6 +1088,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -1087,6 +1088,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
} }
// 1.9.8: 赋值【最新的客服名称】 // 1.9.8: 赋值【最新的客服名称】
registration.setCustomerUsernameNew(registration.getCustomerUsername()); registration.setCustomerUsernameNew(registration.getCustomerUsername());
registration.setCustomerUserLoginname(registration.getCustomerUserLoginname());
baseMapper.insert(registration); baseMapper.insert(registration);
//更新附件 //更新附件
updateFileId(registration); updateFileId(registration);
...@@ -1255,7 +1257,8 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -1255,7 +1257,8 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
LambdaUpdateWrapper<EmployeeRegistration> updateWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<EmployeeRegistration> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(EmployeeRegistration::getDeptNo,updateVo.getDeptNo()) updateWrapper.eq(EmployeeRegistration::getDeptNo,updateVo.getDeptNo())
.eq(EmployeeRegistration::getFeedbackType, CommonConstants.ONE_STRING) .eq(EmployeeRegistration::getFeedbackType, CommonConstants.ONE_STRING)
.set(EmployeeRegistration::getCustomerUsernameNew, updateVo.getCustomerUserName()); .set(EmployeeRegistration::getCustomerUsernameNew, updateVo.getCustomerUserName())
.set(EmployeeRegistration::getCustomerUserLoginNameNew, updateVo.getCustomerUserLoginName());
this.update(updateWrapper); this.update(updateWrapper);
return true; return true;
} }
...@@ -1389,6 +1392,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -1389,6 +1392,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
// 1.9.8: 新增字段 // 1.9.8: 新增字段
insert.setCustomerUsernameNew(selectVo.getCsName()); insert.setCustomerUsernameNew(selectVo.getCsName());
insert.setCustomerUserLoginNameNew(selectVo.getCsLoginName());
} }
//发送企业微信待办 //发送企业微信待办
...@@ -1632,7 +1636,8 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -1632,7 +1636,8 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
YifuUser user,String status) throws ParseException { YifuUser user,String status) throws ParseException {
preVo.setId(registration.getId()); preVo.setId(registration.getId());
preVo.setCustomerUsername(registration.getCustomerUsernameNew()); preVo.setCustomerUsername(registration.getCustomerUsernameNew());
preVo.setCustomerUserLoginname(registration.getCustomerUserLoginname()); preVo.setCustomerUserLoginname(null != registration.getCustomerUserLoginNameNew()
? registration.getCustomerUserLoginNameNew() : registration.getCustomerUserLoginname());
preVo.setDeptName(registration.getDeptName()); preVo.setDeptName(registration.getDeptName());
preVo.setDeptId(registration.getDeptId()); preVo.setDeptId(registration.getDeptId());
preVo.setDataSource(registration.getDataSource()); preVo.setDataSource(registration.getDataSource());
...@@ -1678,7 +1683,8 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -1678,7 +1683,8 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
YifuUser user,String id) throws ParseException { YifuUser user,String id) throws ParseException {
preVo.setRegisterId(id); preVo.setRegisterId(id);
preVo.setCustomerUsername(registration.getCustomerUsernameNew()); preVo.setCustomerUsername(registration.getCustomerUsernameNew());
preVo.setCustomerUserLoginname(registration.getCustomerUserLoginname()); preVo.setCustomerUserLoginname(null != registration.getCustomerUserLoginNameNew()
? registration.getCustomerUserLoginNameNew() : registration.getCustomerUserLoginname());
preVo.setDeptName(registration.getDeptName()); preVo.setDeptName(registration.getDeptName());
preVo.setDeptId(registration.getDeptId()); preVo.setDeptId(registration.getDeptId());
preVo.setDataSource(registration.getDataSource()); preVo.setDataSource(registration.getDataSource());
...@@ -1722,7 +1728,8 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -1722,7 +1728,8 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
YifuUser user, String id) throws ParseException { YifuUser user, String id) throws ParseException {
preVo.setRegisterId(id); preVo.setRegisterId(id);
preVo.setCustomerUsername(registration.getCustomerUsernameNew()); preVo.setCustomerUsername(registration.getCustomerUsernameNew());
preVo.setCustomerUserLoginName(registration.getCustomerUserLoginname()); preVo.setCustomerUserLoginName(null != registration.getCustomerUserLoginNameNew()
? registration.getCustomerUserLoginNameNew() : registration.getCustomerUserLoginname());
preVo.setDeptName(registration.getDeptName()); preVo.setDeptName(registration.getDeptName());
preVo.setDeptId(registration.getDeptId()); preVo.setDeptId(registration.getDeptId());
preVo.setJoinLeaveDate(registration.getJoinLeaveDate()); preVo.setJoinLeaveDate(registration.getJoinLeaveDate());
......
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