Commit f9a9e04d authored by hongguangwu's avatar hongguangwu

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

parents 7b2e1d3c e30065ef
......@@ -83,6 +83,7 @@ public class TEmployeeContractPre extends BaseEntity {
@Schema(description = "撤销签署原因")
private String revokeReason;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@Schema(description = "发起失败原因")
private String errorInfo;
......
......@@ -319,10 +319,10 @@ public class TEmpContractAlertExportVo {
/**
* 异常原因说明
*/
@ExcelAttribute(name = "异常原因说明", maxLength = 200)
@ExcelAttribute(name = "发起失败原因", maxLength = 200)
@Length(max = 200, message = "异常原因说明不能超过200个字符")
@ExcelProperty("异常原因说明")
@Schema(description = "异常原因说明")
@ExcelProperty("发起失败原因")
@Schema(description = "发起失败原因")
private String errorInfo;
}
......@@ -592,11 +592,11 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
contractPreNew.setProcessStatus("1".equals(contractPreNew.getSignType()) ?
CommonConstants.TWO_STRING : CommonConstants.SIX_STRING);
contractPreNew.setContractId(tEmployeeContractInfo.getId());
contractPreNew.setErrorInfo("");
contractPreNew.setErrorTime(null);
contractPreNew.setSignFlag(CommonConstants.ONE_STRING);
contractPreNew.setRevokeReason("");
contractPreNew.setErrorInfo(null);
contractPreNew.setErrorTime(null);
contractPreNewMapper.updateById(contractPreNew);
//更新续签待办提醒的办理状态为处理中
LambdaUpdateWrapper<TEmpContractAlert> updateWrapper = new LambdaUpdateWrapper<>();
......@@ -623,6 +623,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
contractPre.setProcessStatus(CommonConstants.FOUR_STRING);
} else if (tEmployeeContractInfo.getAuditStatus() == CommonConstants.ONE_INT) {
contractPre.setProcessStatus(CommonConstants.TWO_STRING);
contractPre.setErrorInfo(null);
contractPre.setErrorTime(null);
}
contractPre.setRevokeReason("");
contractPre.setSignFlag(CommonConstants.ONE_STRING);
......@@ -638,6 +640,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
contractPreNew.setProcessStatus(CommonConstants.FOUR_STRING);
} else if (tEmployeeContractInfo.getAuditStatus() == CommonConstants.ONE_INT) {
contractPreNew.setProcessStatus(CommonConstants.TWO_STRING);
contractPreNew.setErrorInfo(null);
contractPreNew.setErrorTime(null);
}
contractPreNew.setRevokeReason("");
contractPreNew.setSignFlag(CommonConstants.ONE_STRING);
......
......@@ -698,18 +698,18 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
if (CommonConstants.ONE_STRING.equals(preVo.getContractTerm())){
if (!preVo.getContractDurationYear().equals(preVo.getDispatchPeriodYear())
|| !preVo.getContractDurationMonth().equals(preVo.getDispatchPeriodMonth())){
errorMessages.add("劳务派遣合同需要和标准合同一致");
errorMessages.add("劳务派遣合同年限需要和标准合同年限一致");
}
}
// 如果有错误信息,一起返回
if (!errorMessages.isEmpty()) {
return String.join(";", errorMessages);
return "合同的年限、开始日期、截止日期同派遣的期限、开始日期、截止日期不一致,请调整!";
}
}
//同商务合同一直 要 验证时间 截止时间大于等于开始时间、时间交叉
if (Common.isNotNull(preVo.getContractStart()) && Common.isNotNull(preVo.getContractEnd())){
if (preVo.getContractEnd().before(preVo.getContractStart())){
return "合同截止日期需大于等于合同开始日期";
if (!preVo.getContractEnd().after(preVo.getContractStart())){
return "合同截止日期需大于合同开始日期";
}
}
//更新岗位名称
......@@ -1019,7 +1019,15 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
}
//更新合同的办理状态
updateEmpContractAlertHandleStatus(contractPre.getContractId(), CommonConstants.ONE_STRING);
// 更新processStatus为电子签发起失败
// 如果之前是发起失败状态,清空错误信息
if (CommonConstants.FIVE_STRING.equals(contractPreTemp.getProcessStatus())) {
LambdaUpdateWrapper<TEmployeeContractPreNew> clearErrorWrapper = new LambdaUpdateWrapper<>();
clearErrorWrapper.eq(TEmployeeContractPreNew::getId, contractPreTemp.getId())
.set(TEmployeeContractPreNew::getErrorInfo, null)
.set(TEmployeeContractPreNew::getErrorTime, null);
this.update(clearErrorWrapper);
}
// 更新processStatus为电子签签署中
LambdaUpdateWrapper<TEmployeeContractPreNew> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(TEmployeeContractPreNew::getId, contractPreTemp.getId())
.set(TEmployeeContractPreNew::getProcessStatus, CommonConstants.SIX_STRING);
......@@ -1118,11 +1126,18 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
} else {
//处理成功更新数据
EmployeeContractVO contractVO = disList.stream().filter(vo -> Objects.equals(vo.getRowIndex(), errorMessage.getLineNum())).collect(Collectors.toList()).get(0);
// 先查询旧状态,判断是否需要清空错误信息
TEmployeeContractPreNew oldPre = baseMapper.selectById(contractVO.getPreNewId());
LambdaUpdateWrapper<TEmployeeContractPreNew> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.in(TEmployeeContractPreNew::getId, contractVO.getPreNewId())
.in(TEmployeeContractPreNew::getProcessStatus, CommonConstants.contractDIsStatus)
.set(TEmployeeContractPreNew::getProcessStatus, CommonConstants.TWO_STRING)
.set(TEmployeeContractPreNew::getSignType, CommonConstants.ONE_STRING);
// 如果之前是发起失败状态,清空错误信息
if (Common.isNotNull(oldPre) && CommonConstants.FIVE_STRING.equals(oldPre.getProcessStatus())) {
updateWrapper.set(TEmployeeContractPreNew::getErrorInfo, null)
.set(TEmployeeContractPreNew::getErrorTime, null);
}
this.update(updateWrapper);
//更新合同的办理状态
updateEmpContractAlertHandleStatus(contractVO.getContractId(), CommonConstants.ONE_STRING);
......@@ -1134,11 +1149,18 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
if (errorMessage.getMessage().equals(CommonConstants.SAVE_SUCCESS)){
//处理成功更新数据
EmployeeContractVO contractVO = disList.stream().filter(vo -> Objects.equals(vo.getRowIndex(), errorMessage.getLineNum())).collect(Collectors.toList()).get(0);
// 先查询旧状态,判断是否需要清空错误信息
TEmployeeContractPreNew oldPre = baseMapper.selectById(contractVO.getPreNewId());
LambdaUpdateWrapper<TEmployeeContractPreNew> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(TEmployeeContractPreNew::getId, contractVO.getPreNewId())
.in(TEmployeeContractPreNew::getProcessStatus, CommonConstants.contractDIsStatus)
.set(TEmployeeContractPreNew::getProcessStatus, CommonConstants.TWO_STRING)
.set(TEmployeeContractPreNew::getSignType, CommonConstants.ONE_STRING);
// 如果之前是发起失败状态,清空错误信息
if (Common.isNotNull(oldPre) && CommonConstants.FIVE_STRING.equals(oldPre.getProcessStatus())) {
updateWrapper.set(TEmployeeContractPreNew::getErrorInfo, null)
.set(TEmployeeContractPreNew::getErrorTime, null);
}
this.update(updateWrapper);
//更新合同的办理状态
......
......@@ -495,6 +495,14 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
audit.setCreateName("法大大电子签");
audit.setCreateBy("1");
tEmployeeContractAuditService.save(audit);
// 如果之前是发起失败状态,清空错误信息
if (CommonConstants.FIVE_STRING.equals(contractPre.getProcessStatus())) {
LambdaUpdateWrapper<TEmployeeContractPre> clearErrorWrapper = new LambdaUpdateWrapper<>();
clearErrorWrapper.eq(TEmployeeContractPre::getId, contractPre.getId())
.set(TEmployeeContractPre::getErrorInfo, null)
.set(TEmployeeContractPre::getErrorTime, null);
this.update(clearErrorWrapper);
}
}
}
}
......
......@@ -2712,7 +2712,13 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
.eq(TEmployeeContractPre::getProcessStatus, CommonConstants.TWO_STRING)
.last(CommonConstants.LAST_ONE_SQL));
if (Common.isNotNull(contractPre)) {
String oldStatus = contractPre.getProcessStatus();
contractPre.setProcessStatus(CommonConstants.FOUR_STRING);
// 如果之前是发起失败状态,清空错误信息
if (CommonConstants.FIVE_STRING.equals(oldStatus)) {
contractPre.setErrorInfo(null);
contractPre.setErrorTime(null);
}
contractPreMapper.updateById(contractPre);
}
//瓜子项目编码:皖A694302
......@@ -2763,10 +2769,16 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
//更新合同状态为2线下签审核不通过
TEmployeeContractPre contractPre = contractPreMapper.selectOne(Wrappers.<TEmployeeContractPre>query().lambda()
.eq(TEmployeeContractPre::getContractId, c.getId())
.eq(TEmployeeContractPre::getProcessStatus, CommonConstants.TWO_STRING)
.in(TEmployeeContractPre::getProcessStatus, CommonConstants.FIVE_STRING, CommonConstants.TWO_STRING)
.last(CommonConstants.LAST_ONE_SQL));
if (Common.isNotNull(contractPre)) {
String oldStatus = contractPre.getProcessStatus();
contractPre.setProcessStatus(CommonConstants.THREE_STRING);
// 如果之前是发起失败状态,清空错误信息
if (CommonConstants.FIVE_STRING.equals(oldStatus)) {
contractPre.setErrorInfo(null);
contractPre.setErrorTime(null);
}
contractPreMapper.updateById(contractPre);
}
c.setAuditStatus(CommonConstants.THREE_INT);
......
......@@ -970,7 +970,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
}
private void initFundStartDate(TDispatchInfoPreVo preVo) {
if (null == preVo.getFundStartDate()) {
if (null == preVo.getJoinLeaveDate()) {
TEmployeeContractDateVo initDate = new TEmployeeContractDateVo();
//先计算起缴日期 接收方式 0项目配置 自定义必须填写起缴日期
//0 入职日期 1 入职满个月 2 入职满2个月 3 入职满3个月 4 入职满4个月 5 入职满5个月 6 入职满6个月 7 入职满7个月
......@@ -1282,21 +1282,21 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
&& CommonConstants.ONE_STRING.equals(employeeContractPreVo.getContractTerm())){
if (!employeeContractPreVo.getContractDurationYear().equals(employeeContractPreVo.getDispatchPeriodYear())
|| !employeeContractPreVo.getContractDurationMonth().equals(employeeContractPreVo.getDispatchPeriodMonth())){
allErrorMessages.add("劳务派遣合同需要和标准合同一致");
allErrorMessages.add("劳务派遣合同年限需要和标准合同年限一致");
}
}
// 如果有错误信息,一起返回
if (!allErrorMessages.isEmpty()) {
return "合同的年限、开始日期、截止日期同派遣的期限、开始日期、截止日期不一致,请调整!";
}
// 校验合同有效期:合同截止日期不得早于合同开始日期
if (Common.isNotNull(employeeContractPreVo.getContractStart())
&& Common.isNotNull(employeeContractPreVo.getContractEnd())) {
if (employeeContractPreVo.getContractEnd().before(employeeContractPreVo.getContractStart())) {
allErrorMessages.add("合同截止日期需大于等于合同开始日期");
if (!employeeContractPreVo.getContractEnd().after(employeeContractPreVo.getContractStart())) {
return "合同截止日期需大于合同开始日期";
}
}
// 如果有错误信息,一起返回
if (!allErrorMessages.isEmpty()) {
return String.join(";", allErrorMessages);
}
return null;
}
......@@ -2484,7 +2484,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
if (CommonConstants.ZERO_STRING.equals(preVo.getIsCreateDate())) {
//原社保起缴日期类型为 0 入职日期 新:0 入职日期 1 入职满1个月 2 入职满2个月 3 入职满3个月 4 入职满4个月 5 入职满5个月
// 6 入职满6个月 7 入职满7个月 8 入职满8个月 9 入职满9个月 10 入职满10个月 11 入职满11个月 12 入职满12个月
if (Common.isEmpty(preVo.getSocialStartDate())) {
if (!Common.isEmpty(preVo.getJoinLeaveDate())) {
if (Common.isNotNull(preVo.getSocialDateType())){
TEmployeeContractDateVo vo = new TEmployeeContractDateVo();
vo.setMonthAfter(Integer.parseInt(preVo.getSocialDateType()));
......
......@@ -129,9 +129,9 @@ public class TEmployeeInsurancePreExportVo implements Serializable {
@ExcelProperty("状态")
private String processStatus;
@ExcelAttribute(name = "发起失败原因")
@ExcelProperty("发起失败原因")
@Schema(description = "发起失败原因")
@ExcelAttribute(name = "派单失败原因")
@ExcelProperty("派单失败原因")
@Schema(description = "派单失败原因")
private String errorInfo;
}
......@@ -109,6 +109,6 @@ public class TInsuranceAlertExportVO {
private String customerUsername;
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value = "失败原因")
@ExcelProperty(value = "派单失败原因")
private String errorInfo;
}
......@@ -170,11 +170,11 @@ public class TDispatchInfoPreExportVo implements Serializable {
/**
* 发起失败原因
*/
@ExcelAttribute(name = "发起失败原因", maxLength = 500)
@Schema(description = "发起失败原因")
@ExcelAttribute(name = "派单失败原因", maxLength = 500)
@Schema(description = "派单失败原因")
@HeadFontStyle(fontHeightInPoints = 11)
@ColumnWidth(25)
@ExcelProperty("发起失败原因")
@ExcelProperty("派单失败原因")
private String errorInfo;
}
......@@ -148,11 +148,11 @@ public class TDispatchInfoPreFundExportVo implements Serializable {
/**
* 发起失败原因
*/
@ExcelAttribute(name = "发起失败原因", maxLength = 500)
@Schema(description = "发起失败原因")
@ExcelAttribute(name = "派单失败原因", maxLength = 500)
@Schema(description = "派单失败原因")
@HeadFontStyle(fontHeightInPoints = 11)
@ColumnWidth(25)
@ExcelProperty("发起失败原因")
@ExcelProperty("派单失败原因")
private String errorInfo;
}
......@@ -1163,11 +1163,14 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if (Common.isNotNull(dispatch.getPreId())) {
TDispatchInfoPre dispatchInfoPre = dispatchInfoPreMapper.selectById(dispatch.getPreId());
if (Common.isNotNull(dispatchInfoPre)) {
// 当状态从派单失败(2)变更为待审核(3)时,清空错误信息
if (CommonConstants.TWO_STRING.equals(dispatchInfoPre.getProcessStatus())) {
dispatchInfoPre.setErrorInfo(null);
dispatchInfoPre.setErrorTime(null);
}
dispatchInfoPre.setProcessStatus(CommonConstants.THREE_STRING);
dispatchInfoPre.setDispatcherId(socialFund.getDispatchId());
dispatchInfoPre.setSocialFundId(socialFund.getId());
dispatchInfoPre.setErrorInfo(null);
dispatchInfoPre.setErrorTime(null);
dispatchInfoPreMapper.updateById(dispatchInfoPre);
}
}
......
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