Commit 570d744c authored by huyuchen's avatar huyuchen

Merge remote-tracking branch 'origin/fxj-dev' into fxj-dev

parents 526fecbf 56a16a85
...@@ -342,30 +342,35 @@ public class DoJointInsuranceTask { ...@@ -342,30 +342,35 @@ public class DoJointInsuranceTask {
List<EkpSocialViewVo> viewVo; List<EkpSocialViewVo> viewVo;
try { try {
//薪资结算状态同步暂时解决方案为定时任务去更新 //薪资结算状态同步暂时解决方案为定时任务去更新
TUpdateStatusError error = new TUpdateStatusError(); /*TUpdateStatusError error = new TUpdateStatusError();
error.setSettleNo(vo.getSettleNo()); error.setSettleNo(vo.getSettleNo());
error.setStatus(CommonConstants.ZERO_INT); error.setStatus(CommonConstants.ZERO_INT);
error.setTitle("薪资结算状态同步失败"); error.setTitle("薪资结算状态同步成功");
error.setTypeFlag(CommonConstants.FIVE_STRING); error.setTypeFlag(CommonConstants.FIVE_STRING);
error.setCreateTime(DateUtil.getCurrentDateTime()); error.setCreateTime(DateUtil.getCurrentDateTime());
error.setSettleType(vo.getPayFlag()); error.setSettleType(vo.getPayFlag());
updateStatusErrorMapper.insert(error);*/
TUpdateStatusError error = new TUpdateStatusError();
error.setSettleNo(vo.getSettleNo());
error.setCreateTime(DateUtil.getCurrentDateTime());
error.setSettleType(vo.getPayFlag());
error.setTypeFlag(CommonConstants.FIVE_STRING);
//根据结算单号获取明细id和结算状态
viewVo = ekpSettleService.selectSalarylViewBySettleNo(vo.getSettleNo(), vo.getPayFlag());
if (!viewVo.isEmpty()) {
viewVo.forEach(e -> e.setPayFlag(vo.getPayFlag()));
R<Boolean> flag = salaryDaprUtil.updateSalarySettleStatus(viewVo);
if (Common.isEmpty(flag) || Boolean.TRUE.equals(!flag.getData())) {
error.setStatus(CommonConstants.ZERO_INT);
error.setTitle("薪资结算状态同步失败");
updateStatusErrorMapper.insert(error); updateStatusErrorMapper.insert(error);
// //根据结算单号获取明细id和结算状态 }else {
// viewVo = ekpSettleService.selectSalarylViewBySettleNo(vo.getSettleNo(), vo.getPayFlag()); error.setStatus(CommonConstants.ZERO_INT);
// if (!viewVo.isEmpty()) { error.setTitle("薪资结算状态同步成功");
// 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());
......
...@@ -6,8 +6,8 @@ spring: ...@@ -6,8 +6,8 @@ spring:
activate: activate:
on-profile: test on-profile: test
redis: redis:
host: 127.0.0.1 host: 192.168.1.65
port: 6379 port: 22379
password: '@yf_2017' password: '@yf_2017'
datasource: datasource:
insurances: insurances:
......
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