Skip to content

Y
yifu-mvp
Commit 15e3902b authored by fangxinjiang's avatar fangxinjiang
Browse files
Options

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

parents 00c4083a cdeef757
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 20 deletions
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/util/DoJointInsuranceTask.java
View file @ 15e3902b
...@@ -341,22 +341,31 @@ public class DoJointInsuranceTask { ...@@ -341,22 +341,31 @@ public class DoJointInsuranceTask {
public void updateSalarySettleStatus(EkpStatusParamVo vo) { public void updateSalarySettleStatus(EkpStatusParamVo vo) {
List<EkpSocialViewVo> viewVo; List<EkpSocialViewVo> viewVo;
try { try {
//根据结算单号获取明细id和结算状态 //薪资结算状态同步暂时解决方案为定时任务去更新
viewVo = ekpSettleService.selectSalarylViewBySettleNo(vo.getSettleNo(), vo.getPayFlag()); TUpdateStatusError error = new TUpdateStatusError();
if (!viewVo.isEmpty()) { error.setSettleNo(vo.getSettleNo());
viewVo.forEach(e -> e.setPayFlag(vo.getPayFlag())); error.setStatus(CommonConstants.ZERO_INT);
R<Boolean> flag = salaryDaprUtil.updateSalarySettleStatus(viewVo); error.setTitle("薪资结算状态同步失败");
if (Common.isEmpty(flag) || Boolean.TRUE.equals(!flag.getData())) { error.setTypeFlag(CommonConstants.FIVE_STRING);
TUpdateStatusError error = new TUpdateStatusError(); error.setCreateTime(DateUtil.getCurrentDateTime());
error.setSettleNo(vo.getSettleNo()); error.setSettleType(vo.getPayFlag());
error.setStatus(CommonConstants.ZERO_INT); updateStatusErrorMapper.insert(error);
error.setTitle("薪资结算状态同步失败"); // //根据结算单号获取明细id和结算状态
error.setTypeFlag(CommonConstants.FIVE_STRING); // viewVo = ekpSettleService.selectSalarylViewBySettleNo(vo.getSettleNo(), vo.getPayFlag());
error.setCreateTime(DateUtil.getCurrentDateTime()); // if (!viewVo.isEmpty()) {
error.setSettleType(vo.getPayFlag()); // viewVo.forEach(e -> e.setPayFlag(vo.getPayFlag()));
updateStatusErrorMapper.insert(error); // R<Boolean> flag = salaryDaprUtil.updateSalarySettleStatus(viewVo);
} // if (Common.isEmpty(flag) || Boolean.TRUE.equals(!flag.getData())) {
} // TUpdateStatusError error = new TUpdateStatusError();
// error.setSettleNo(vo.getSettleNo());
// error.setStatus(CommonConstants.ZERO_INT);
// error.setTitle("薪资结算状态同步失败");
// error.setTypeFlag(CommonConstants.FIVE_STRING);
// error.setCreateTime(DateUtil.getCurrentDateTime());
// error.setSettleType(vo.getPayFlag());
// updateStatusErrorMapper.insert(error);
// }
// }
} catch (Exception e) { } catch (Exception e) {
TUpdateStatusError error = new TUpdateStatusError(); TUpdateStatusError error = new TUpdateStatusError();
error.setSettleNo(vo.getSettleNo()); error.setSettleNo(vo.getSettleNo());
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TForecastLibraryServiceImpl.java
View file @ 15e3902b
...@@ -2405,8 +2405,8 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -2405,8 +2405,8 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
initEkpPushSocialParam(unPushInfo,true,selectVoMap); initEkpPushSocialParam(unPushInfo,true,selectVoMap);
} }
} }
unPushInfo.clear(); // unPushInfo.clear();
selectVoMap.clear(); // selectVoMap.clear();
} }
} }
...@@ -2442,8 +2442,8 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -2442,8 +2442,8 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
initEkpPushFundParam(unPushInfo,true,selectVoMap); initEkpPushFundParam(unPushInfo,true,selectVoMap);
} }
} }
unPushInfo.clear(); // unPushInfo.clear();
selectVoMap.clear(); // selectVoMap.clear();
} }
} }
......
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