Commit 1419a49b authored by hongguangwu's avatar hongguangwu

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

parents eea786b4 0d194f70
...@@ -145,7 +145,7 @@ public class DoFascTask { ...@@ -145,7 +145,7 @@ public class DoFascTask {
preNew.setRequestId(""); preNew.setRequestId("");
} }
preNew.setSignFlag(CommonConstants.ZERO_STRING); preNew.setSignFlag(CommonConstants.ZERO_STRING);
preNew.setRevokeReason(terminationNote); preNew.setRevokeReason(Common.isEmpty(terminationNote)?CommonConstants.EMPTY_STRING:terminationNote);
tEmployeeContractPreNewService.updateById(preNew); tEmployeeContractPreNewService.updateById(preNew);
} }
//如果存在合同申请审核数据,将状态更新成5撤销签署 //如果存在合同申请审核数据,将状态更新成5撤销签署
...@@ -158,7 +158,7 @@ public class DoFascTask { ...@@ -158,7 +158,7 @@ public class DoFascTask {
|| fddEvent.equals("sign-task-fill-rejected")) { || fddEvent.equals("sign-task-fill-rejected")) {
// 3:签署任务参与方签署失败事件 // 3:签署任务参与方签署失败事件
preNew.setProcessStatus(CommonConstants.dingleDigitStrArray[7]); preNew.setProcessStatus(CommonConstants.dingleDigitStrArray[7]);
preNew.setErrorInfo(terminationNote); preNew.setErrorInfo(Common.isEmpty(terminationNote)?CommonConstants.EMPTY_STRING:terminationNote);
preNew.setErrorTime(new Date()); preNew.setErrorTime(new Date());
preNew.setRequestId(""); preNew.setRequestId("");
tEmployeeContractPreNewService.updateById(preNew); tEmployeeContractPreNewService.updateById(preNew);
......
...@@ -217,6 +217,7 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap ...@@ -217,6 +217,7 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
for (TSocialPreDetailVo vo : registrationPreVo.getExitSocialInfoList()) { for (TSocialPreDetailVo vo : registrationPreVo.getExitSocialInfoList()) {
TSocialPreDetail preDetal = new TSocialPreDetail(); TSocialPreDetail preDetal = new TSocialPreDetail();
BeanUtils.copyProperties(vo, preDetal); BeanUtils.copyProperties(vo, preDetal);
preDetal.setId(null);
socialPreDetailService.save(preDetal); socialPreDetailService.save(preDetal);
} }
//批量删除社保待购买列表中的待确认、待派单、派单失败、审核、办理失败的数据 //批量删除社保待购买列表中的待确认、待派单、派单失败、审核、办理失败的数据
...@@ -292,6 +293,7 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap ...@@ -292,6 +293,7 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
for (TFundPreDetailVo vo : registrationPreVo.getExitFundInfoList()) { for (TFundPreDetailVo vo : registrationPreVo.getExitFundInfoList()) {
TFundPreDetail preDetal = new TFundPreDetail(); TFundPreDetail preDetal = new TFundPreDetail();
BeanUtils.copyProperties(vo, preDetal); BeanUtils.copyProperties(vo, preDetal);
preDetal.setId(null);
fundPreDetailService.save(preDetal); fundPreDetailService.save(preDetal);
} }
//批量删除公积金待购买列表中的待确认、待派单、派单失败、审核、办理失败的数据 //批量删除公积金待购买列表中的待确认、待派单、派单失败、审核、办理失败的数据
......
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