Commit d11d7495 authored by fangxinjiang's avatar fangxinjiang

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

parents e655a8bd 8f453234
......@@ -137,13 +137,17 @@ public class TEmployeeContractPreController {
YifuUser user = SecurityUtils.getUser();
//如果是电子签发起线下签先更新为线下签
if(null != signType && null != idList) {
TEmployeeContractPre tEmployeeContractPre;
// 2025-11-3 14:54:57 测试(龙弟)说发起线下签署,如果是电子签,将撤销原因,是否撤销还原到初始的
for (String id : idList) {
TEmployeeContractPre tEmployeeContractPre = tEmployeeContractPreService.getById(id);
tEmployeeContractPre = tEmployeeContractPreService.getById(id);
if (tEmployeeContractPre != null && "0".equals(tEmployeeContractPre.getSignType())) {
tEmployeeContractPre.setSignType("1");
tEmployeeContractPre.setChangeTypeReason("手动派单转为线下签");
tEmployeeContractPre.setChangeTypeUser(user.getNickname());
tEmployeeContractPre.setChangeTypeTime(DateUtil.getCurrentDateTime());
tEmployeeContractPre.setSignFlag(CommonConstants.ONE_STRING);
tEmployeeContractPre.setRevokeReason("");
tEmployeeContractPreService.updateById(tEmployeeContractPre);
}
}
......
......@@ -561,6 +561,9 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
contractPre.setContractId(tEmployeeContractInfo.getId());
contractPre.setErrorInfo("");
contractPre.setErrorTime(null);
contractPre.setSignFlag(CommonConstants.ONE_STRING);
contractPre.setRevokeReason("");
contractPreMapper.updateById(contractPre);
}
}
......
......@@ -616,6 +616,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
.ne(TEmployeeContractPre::getProcessStatus, CommonConstants.NINE_STRING)
.ne(TEmployeeContractPre::getProcessStatus, CommonConstants.FOUR_STRING)
.ne(TEmployeeContractPre::getProcessStatus, CommonConstants.TEN_STRING)
.ne(TEmployeeContractPre::getProcessStatus, CommonConstants.ELEVEN_STRING)
.ne(TEmployeeContractPre::getProcessStatus, CommonConstants.EIGHT_STRING));
if (Common.isEmpty(contractPreList)) {
return R.failed(CommonConstants.NO_DATA_TO_HANDLE);
......@@ -948,9 +949,9 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
List<TEmployeeContractPre> revokedContracts = baseMapper.selectList(Wrappers.<TEmployeeContractPre>query()
.lambda()
.in(TEmployeeContractPre::getContractId, contractIds)
.eq(TEmployeeContractPre::getProcessStatus, CommonConstants.ONE_STRING) // 待发起
.eq(TEmployeeContractPre::getProcessStatus, CommonConstants.ELEVEN_STRING) // 撤销签署-系统自动撤销
.eq(TEmployeeContractPre::getSignType, CommonConstants.ONE_STRING) // 线下签
.eq(TEmployeeContractPre::getRevokeReason, "超时未签署自行变更为线下签")
.eq(TEmployeeContractPre::getChangeTypeReason, "超时未签署自行变更为线下签")
);
if (Common.isEmpty(revokedContracts)) {
......
......@@ -455,6 +455,11 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
simNew.put("socialIsBuy", isSocailBuyNew);
this.setLogBaseInfo(empPreId, old, simNew, user, differenceSocialKey, logId, detailSocialLog);
detailList.add(detailSocialLog);
if (Common.isNotNull(diffTitle)) {
diffTitle += "、社保信息";
} else {
diffTitle = "社保信息";
}
}
//查询老的社保明细
R<EmployeePreSocialListVo> socialSdr = socialDaprUtils.getSocialPreInfoList(empPreId);
......
......@@ -130,7 +130,9 @@ public class DoFascTask {
// 加日志
this.saveAuditLogFail(pre, "撤销签署成功", terminationNote);
}
pre.setProcessStatus(CommonConstants.TEN_STRING);
if (!CommonConstants.ELEVEN_STRING.equals(pre.getProcessStatus())) {
pre.setProcessStatus(CommonConstants.TEN_STRING);
}
pre.setSignFlag(CommonConstants.ZERO_STRING);
pre.setRevokeReason(terminationNote);
tEmployeeContractPreService.updateById(pre);
......@@ -202,7 +204,9 @@ public class DoFascTask {
// 加日志
this.saveAuditLogFail(preHistory, "撤销签署成功", terminationNote);
}
preHistory.setProcessStatus(CommonConstants.TEN_STRING);
if (!CommonConstants.ELEVEN_STRING.equals(preHistory.getProcessStatus())) {
preHistory.setProcessStatus(CommonConstants.TEN_STRING);
}
preHistory.setSignFlag(CommonConstants.ZERO_STRING);
preHistory.setRevokeReason(terminationNote);
tEmployeeContractPreHistoryService.updateById(preHistory);
......
......@@ -60,6 +60,8 @@ public class FascUtil {
private static final String DATA_COVER = "dataCover";
private static final String DATE_FORMAT = "dateFormat";
private static final String YEAR_STR = "年";
private static final String MONTH_STR = "个月";
private static final SerializerFeature[] features = new SerializerFeature[]{
WriteMapNullValue, WriteNullNumberAsZero, WriteNullListAsEmpty,
......@@ -459,7 +461,16 @@ public class FascUtil {
fieldName = detail.getHrFieldId();
fieldNameChinese = detail.getHrField();
if (FascConstants.CONTRACT_DURATION.equals(fieldName)) {
fieldValue = contract.getContractDurationYear() + CommonConstants.CENTER_SPLIT_LINE_STRING + contract.getContractDurationMonth();
if (Common.isNotNull(contract.getContractDurationYear()) && !CommonConstants.ZERO_STRING.equals(contract.getContractDurationYear())) {
fieldValue = contract.getContractDurationYear() + YEAR_STR;
}
if (Common.isNotNull(contract.getContractDurationMonth()) && !CommonConstants.ZERO_STRING.equals(contract.getContractDurationMonth())) {
if (Common.isNotNull(fieldValue)) {
fieldValue += contract.getContractDurationMonth() + MONTH_STR;
} else {
fieldValue = contract.getContractDurationMonth() + MONTH_STR;
}
}
} else if (FascConstants.DISPATCH_PERIOD.equals(fieldName)) {
fieldValue = contract.getDispatchPeriodYear() + CommonConstants.CENTER_SPLIT_LINE_STRING + contract.getDispatchPeriodMonth();
} else if (FascConstants.EMP_SEX.equals(fieldName)) {
......
......@@ -175,7 +175,7 @@
FROM t_fasc_template_detail a
left join t_fasc_template b on a.sign_template_id = b.sign_template_id
left join t_fasc_hr_field h on h.hr_field_id = a.hr_field_id and h.hr_field = a.hr_field
where b.delete_Flag = '0' and a.hr_field_id is not null and a.sign_template_id = #{fadadaTemplateId}
where b.delete_Flag = '0' and a.delete_flag = '0' and a.hr_field_id is not null and a.sign_template_id = #{fadadaTemplateId}
</select>
<!--tFascTemplateDetail简单分页查询-->
......
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