diff --git a/src/main/java/com/qs/serve/common/framework/manager/AsyncFactory.java b/src/main/java/com/qs/serve/common/framework/manager/AsyncFactory.java index 9efd2bbb..46bbc46b 100644 --- a/src/main/java/com/qs/serve/common/framework/manager/AsyncFactory.java +++ b/src/main/java/com/qs/serve/common/framework/manager/AsyncFactory.java @@ -133,19 +133,6 @@ public class AsyncFactory { finishedParam.setPolicyId(policyId); operationService.doFinished(finishedParam); } - DataAffairCommitService commitService = SpringUtils.getBean(DataAffairCommitService.class); - // 获取最后一条审批判断结果:TbsAffairCommitBo.state 0-否定,1-同意,2-退回 - Integer state = commitService.getState(operationService.getTemplateCode(),policyId+""); - //调用成功回调方法 - TbsAffairCommitBo doParam = new TbsAffairCommitBo(); - doParam.setPolicyId(policyId); - if (state==null||state==1){ - operationService.doFinished(doParam); - }else if (state==2){ - operationService.doBacked(doParam); - }else if (state==0){ - operationService.doRefuse(doParam); - } log.debug("--------------------------SubmitPolicy CallbackTimer summeryResult:{}------------------------------",summeryResult); } catch (Exception e) { e.printStackTrace(); @@ -175,18 +162,10 @@ public class AsyncFactory { TbsBudgetChangeOperationServiceImpl applyOperationService = SpringUtils.getBean(TbsBudgetChangeOperationServiceImpl.class); String summeryResult = applyOperationService.checkAffairSummery(budgetId); - DataAffairCommitService commitService = SpringUtils.getBean(DataAffairCommitService.class); - // 获取最后一条审批判断结果:TbsAffairCommitBo.state 0-否定,1-同意,2-退回 - Integer state = commitService.getState(applyOperationService.getTemplateCode(),budgetId+""); - //调用成功回调方法 - TbsAffairCommitBo doParam = new TbsAffairCommitBo(); - doParam.setTargetId(budgetId); - if (state==null||state==1){ + if(summeryResult.equals(TzcPolicyOperationServiceImpl.SummeryState_Success)){ + TbsAffairCommitBo doParam = new TbsAffairCommitBo(); + doParam.setTargetId(budgetId); applyOperationService.doFinished(doParam); - }else if (state==2){ - applyOperationService.doBacked(doParam); - }else if (state==0){ - applyOperationService.doRefuse(doParam); } log.debug("--------------------------SubmitBudgetApply CallbackTimer summeryResult:{} ------------------------------",summeryResult); } catch (Exception e) { @@ -212,18 +191,10 @@ public class AsyncFactory { TbsBudgetBatchOperationServiceImpl operationService = SpringUtils.getBean(TbsBudgetBatchOperationServiceImpl.class); String summeryResult = operationService.checkAffairSummery(batchId); - DataAffairCommitService commitService = SpringUtils.getBean(DataAffairCommitService.class); - // 获取最后一条审批判断结果:TbsAffairCommitBo.state 0-否定,1-同意,2-退回 - Integer state = commitService.getState(operationService.getTemplateCode(),batchId+""); - //调用成功回调方法 - TbsAffairCommitBo doParam = new TbsAffairCommitBo(); - doParam.setTargetId(batchId); - if (state==null||state==1){ + if(summeryResult.equals(TzcPolicyOperationServiceImpl.SummeryState_Success)){ + TbsAffairCommitBo doParam = new TbsAffairCommitBo(); + doParam.setTargetId(batchId); operationService.doFinished(doParam); - }else if (state==2){ - operationService.doBacked(doParam); - }else if (state==0){ - operationService.doRefuse(doParam); } log.debug("--------------------------SubmitBudgetApply CallbackTimer summeryResult:{} ------------------------------",summeryResult); @@ -249,21 +220,10 @@ public class AsyncFactory { Thread.sleep(3*1000); TbsBudgetApplyOperationServiceImpl applyOperationService = SpringUtils.getBean(TbsBudgetApplyOperationServiceImpl.class); String summeryResult = applyOperationService.checkAffairSummery(budgetId); - DataAffairCommitService commitService = SpringUtils.getBean(DataAffairCommitService.class); - // TbsAffairCommitBo.state 0-否定,1-同意,2-退回 - Integer state = commitService.getState(applyOperationService.getTemplateCode(),budgetId+""); - //获取最后一条审批判断结果 - if(state==null){ - return; - } - TbsAffairCommitBo doParam = new TbsAffairCommitBo(); - doParam.setTargetId(budgetId); - if (state == 1){ + if(summeryResult.equals(TzcPolicyOperationServiceImpl.SummeryState_Success)){ + TbsAffairCommitBo doParam = new TbsAffairCommitBo(); + doParam.setTargetId(budgetId); applyOperationService.doFinished(doParam); - }else if (state==2){ - applyOperationService.doBacked(doParam); - }else if (state==0){ - applyOperationService.doRefuse(doParam); } log.debug("--------------------------SubmitBudgetApply CallbackTimer summeryResult:{} ------------------------------",summeryResult); } catch (Exception e) { diff --git a/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java b/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java index c114a07c..62ff8ba3 100644 --- a/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java +++ b/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java @@ -372,18 +372,18 @@ public interface SeeYonOperationService extends SeeYonBaseService{ e.printStackTrace(); } + if(flag!=null && isBackCommit){ + this.doBacked(affairCommit); + return R.ok(); + } + //审批中(next)、完成(finish)、拒绝(refused) if("finished".equals(flag)){ this.doFinished(affairCommit); return R.ok(); }else if ("refuse".equals(flag)||"backed".equals(flag)){ - if(isBackCommit){ - this.doBacked(affairCommit); - return R.ok(); - }else { - this.doRefuse(affairCommit); - return R.ok(); - } + this.doRefuse(affairCommit); + return R.ok(); }else if ("next".equals(flag)){ this.doNext(affairCommit); doCommitBacked(getTargetId(affairCommit)); @@ -392,7 +392,7 @@ public interface SeeYonOperationService extends SeeYonBaseService{ }else if (result.getStatus()==500){ return result; } - return R.ok(); + return R.error("远程调用失败"); } /** diff --git a/src/main/java/com/qs/serve/modules/third/PortalOfCostController.java b/src/main/java/com/qs/serve/modules/third/PortalOfCostController.java index 9cfb5fc3..23b948ee 100644 --- a/src/main/java/com/qs/serve/modules/third/PortalOfCostController.java +++ b/src/main/java/com/qs/serve/modules/third/PortalOfCostController.java @@ -16,6 +16,7 @@ import com.qs.serve.modules.third.consts.ThirtyConst; import com.qs.serve.modules.third.entity.*; import com.qs.serve.modules.third.service.PortalOfCostApplication; import com.qs.serve.modules.third.service.PortalOfCostPartApplication; +import com.qs.serve.modules.third.util.ThirtyVerificationUtil; import com.qs.serve.modules.tzc.service.TzcPolicyGoodsSyncService; import com.qs.serve.modules.vtb.common.VtbVerificationState; import com.qs.serve.modules.vtb.entity.VtbVerification; @@ -236,14 +237,6 @@ public class PortalOfCostController { return R.ok(); } - /** - * 修复数据方法,修复后可删除 - * @return - */ - @GetMapping("/cpSyncLogByDong") - public R cpSyncLogByDong(){ - portalOfCostApplication.repairCaCost(); - return R.ok(); - } + } diff --git a/src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java b/src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java index f3983fdc..a670e893 100644 --- a/src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java +++ b/src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java @@ -1294,12 +1294,12 @@ public class PortalOfCostApplication { * 修复数据方法,修复后可删除 */ public void repairCaCost(){ - Assert.throwEx("DEV"); + //Assert.throwEx("DEV"); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); lqw.eq(SysSyncLog::getFromPlat,"一站式费用ByDong"); //只处理成功的 lqw.eq(SysSyncLog::getSuccessStatus,1); - lqw.in(SysSyncLog::getId,13506L,13542L,13674L,8323L,12510L,12585L,12642L,12645L,12660L,12708L,13298L); + lqw.in(SysSyncLog::getId,13309L); List syncLogList = sysSyncLogService.list(lqw); for (SysSyncLog syncLog : syncLogList) { ProcessCreatePolicyCostBo applyBo = JsonUtil.jsonToPojo(syncLog.getRequestJson(),ProcessCreatePolicyCostBo.class); @@ -1311,7 +1311,7 @@ public class PortalOfCostApplication { SysTableTemp sysTableTemp = new SysTableTemp(); sysTableTemp.setTableName("sys_sync_log"); sysTableTemp.setTableId(syncLog.getId()+""); - sysTableTemp.setOptionTitle("修复CA数据"); + sysTableTemp.setOptionTitle("0305修复CA数据"); for (int i = 0; i < costApplyList.size(); i++) { TbsCostApply costApply = costApplyList.get(i);