Commit 7340a3bf authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.7.16' into MVP1.7.16

parents 96750f36 07db1560
...@@ -2685,6 +2685,15 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -2685,6 +2685,15 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
} }
//审核不同 //审核不同
} else if (CommonConstants.ONE_STRING.equals(vo.getType())) { } else if (CommonConstants.ONE_STRING.equals(vo.getType())) {
//更新合同状态为2线下签审核不通过
TEmployeeContractPre contractPre = contractPreMapper.selectOne(Wrappers.<TEmployeeContractPre>query().lambda()
.eq(TEmployeeContractPre::getContractId, c.getId())
.eq(TEmployeeContractPre::getProcessStatus, CommonConstants.TWO_STRING)
.last(CommonConstants.LAST_ONE_SQL));
if (Common.isNotNull(contractPre)) {
contractPre.setProcessStatus(CommonConstants.THREE_STRING);
contractPreMapper.updateById(contractPre);
}
c.setAuditStatus(CommonConstants.THREE_INT); c.setAuditStatus(CommonConstants.THREE_INT);
c.setInUse(CommonConstants.ONE_STRING); c.setInUse(CommonConstants.ONE_STRING);
contractAudit.setAuditStatus("审核不通过"); contractAudit.setAuditStatus("审核不通过");
......
...@@ -231,6 +231,8 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -231,6 +231,8 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
SOCIAL_IGNORE_FIELD.add("updateBy"); SOCIAL_IGNORE_FIELD.add("updateBy");
SOCIAL_IGNORE_FIELD.add("id"); SOCIAL_IGNORE_FIELD.add("id");
SOCIAL_IGNORE_FIELD.add("expectedCollectionType"); SOCIAL_IGNORE_FIELD.add("expectedCollectionType");
SOCIAL_IGNORE_FIELD.add("upperLimit");
SOCIAL_IGNORE_FIELD.add("lowerLimit");
} }
@Override @Override
...@@ -410,7 +412,9 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -410,7 +412,9 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
// 执行更新操作,清空附件的关联ID // 执行更新操作,清空附件的关联ID
attaInfoService.update(updateWrapperContract); attaInfoService.update(updateWrapperContract);
//删除历史的合同待签订数据 //删除历史的合同待签订数据
contractPreService.removeById(contractOld.getId()); contractPreService.remove(Wrappers.<TEmployeeContractPre>query().lambda()
.in(TEmployeeContractPre::getProcessStatus, Arrays.asList("0","1","3","5","7","10","11"))
.eq(TEmployeeContractPre::getId,contractOld.getId()));
} }
if (newInfo.getServerItem().contains("合同") && contractOld != null && employeeContractPre != null) { if (newInfo.getServerItem().contains("合同") && contractOld != null && employeeContractPre != null) {
//1.9.11 huych 附件类型不比较差异 //1.9.11 huych 附件类型不比较差异
...@@ -528,6 +532,9 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -528,6 +532,9 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
if (newInfo.getServerItem().contains("社保")) { if (newInfo.getServerItem().contains("社保")) {
EmployeeRegistrationPreVo preVo = new EmployeeRegistrationPreVo(); EmployeeRegistrationPreVo preVo = new EmployeeRegistrationPreVo();
BeanUtils.copyProperties(newInfo,preVo); BeanUtils.copyProperties(newInfo,preVo);
if (null != preVo.getExitSocialInfoList() && !preVo.getExitSocialInfoList().isEmpty()) {
preVo.getExitSocialInfoList().forEach(socialPreDetailVo -> socialPreDetailVo.setRegisterId(empPreId));
}
initSocialPreInfo(preVo, preVo.getDispatchInfoPreVo(), user,empPreId); initSocialPreInfo(preVo, preVo.getDispatchInfoPreVo(), user,empPreId);
socialDaprUtils.saveSocialPreInfo(preVo); socialDaprUtils.saveSocialPreInfo(preVo);
} }
...@@ -674,7 +681,10 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -674,7 +681,10 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
// 执行更新操作,清空附件的关联ID // 执行更新操作,清空附件的关联ID
attaInfoService.update(updateWrapperContract); attaInfoService.update(updateWrapperContract);
//删除历史的合同待签订数据 //删除历史的合同待签订数据
contractPreService.removeById(contractOld.getId()); contractPreService.remove(Wrappers.<TEmployeeContractPre>query().lambda()
.in(TEmployeeContractPre::getProcessStatus, Arrays.asList("0","1","3","5","7","10","11"))
.eq(TEmployeeContractPre::getId,contractOld.getId()));
} }
if (newInfo.getServerItem().contains("合同") && contractOld != null && employeeContractPre != null) { if (newInfo.getServerItem().contains("合同") && contractOld != null && employeeContractPre != null) {
//1.9.11 huych 附件类型不比较差异 //1.9.11 huych 附件类型不比较差异
......
...@@ -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.setCustomerUserLoginNameNew(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());
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
<result property="customerUserLoginname" column="customer_user_loginname"/> <result property="customerUserLoginname" column="customer_user_loginname"/>
<result property="dataSource" column="data_source"/> <result property="dataSource" column="data_source"/>
<result property="customerUsernameNew" column="customer_username_new"/> <result property="customerUsernameNew" column="customer_username_new"/>
<result property="customerUserLoginNameNew" column="customer_user_login_name_new"/>
</resultMap> </resultMap>
<resultMap id="employeeRegistrationExportMap" type="com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationExportVo"> <resultMap id="employeeRegistrationExportMap" type="com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationExportVo">
...@@ -119,7 +120,7 @@ ...@@ -119,7 +120,7 @@
a.customer_phone, a.customer_phone,
a.customer_user_loginname, a.customer_user_loginname,
a.data_source, a.data_source,
a.customer_username_new a.customer_username_new,a.customer_user_login_name_new
</sql> </sql>
<sql id="employeeRegistration_where"> <sql id="employeeRegistration_where">
<if test="employeeRegistration != null"> <if test="employeeRegistration != null">
...@@ -253,7 +254,7 @@ ...@@ -253,7 +254,7 @@
1=1 1=1
<include refid="employeeRegistration_where"/> <include refid="employeeRegistration_where"/>
</where> </where>
limit 0,3 limit 0,2000
</select> </select>
<!--employeeRegistration简单分页查询--> <!--employeeRegistration简单分页查询-->
......
...@@ -414,7 +414,7 @@ ...@@ -414,7 +414,7 @@
<include refid="tDispatchInfoPre_other_where"/> <include refid="tDispatchInfoPre_other_where"/>
</where> </where>
order by a.create_time desc order by a.create_time desc
limit 0,3 limit 0,2000
</select> </select>
<!--tDispatchInfoPre社保待派单数据查询--> <!--tDispatchInfoPre社保待派单数据查询-->
......
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