From 02c9e560a3bdbb0ac87dae21b9351e9516847511 Mon Sep 17 00:00:00 2001 From: Yen Date: Mon, 4 Mar 2024 10:03:18 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=87=8D=E6=9E=84=E9=80=80=E5=9B=9E?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=8B=BC=E6=8E=A5v2=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../seeyon/service/SeeYonOperationService.java | 4 ++-- .../tbs/controller/TbsBudgetCheckController.java | 12 ++++++++++++ .../modules/tbs/entity/bo/TbsAffairCommitBo.java | 5 +++++ .../impl/TbsBudgetApplyOperationServiceImpl.java | 6 ++++++ .../impl/TbsBudgetChangeOperationServiceImpl.java | 5 +++++ .../impl/TzcPolicyApplicationServiceImpl.java | 4 ++++ 6 files changed, 34 insertions(+), 2 deletions(-) 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 d3df9286..ab1be264 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 @@ -418,7 +418,7 @@ public interface SeeYonOperationService extends SeeYonBaseService{ * @return */ default Object compensateBacked(String targetId){ - return null; + return this.doBacked(new TbsAffairCommitBo(targetId)); } /** @@ -436,7 +436,7 @@ public interface SeeYonOperationService extends SeeYonBaseService{ * @return */ default Object compensateRefuse(String targetId){ - return null; + return this.doRefuse(new TbsAffairCommitBo(targetId)); } /** diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetCheckController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetCheckController.java index 72fa5471..9ec7e8c4 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetCheckController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetCheckController.java @@ -50,6 +50,18 @@ public class TbsBudgetCheckController { return R.ok(); } + @PostMapping("runApplyCompensate/{id}") + public R runCompensate(@PathVariable("id") Long id){ + tbsBudgetApplyOperationService.runCompensate(id+""); + return R.ok(); + } + + @PostMapping("runChangeCompensate/{id}") + public R runChangeCompensate(@PathVariable("id") Long id){ + tbsBudgetChangeOperationService.runCompensate(id+""); + return R.ok(); + } + /** * 提交更新申请 * @param param diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsAffairCommitBo.java b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsAffairCommitBo.java index 00ca9a79..fc35e107 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsAffairCommitBo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsAffairCommitBo.java @@ -16,6 +16,11 @@ import java.util.List; @Data public class TbsAffairCommitBo { + public TbsAffairCommitBo(){} + public TbsAffairCommitBo(String targetId){ + this.targetId = targetId; + } + /** * 旧版的：费用申请id、核销id（截止2023/5/23） */ diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetApplyOperationServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetApplyOperationServiceImpl.java index 9140204b..b0d5bb90 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetApplyOperationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetApplyOperationServiceImpl.java @@ -113,4 +113,10 @@ public class TbsBudgetApplyOperationServiceImpl implements SeeYonOperationServic return TbsSeeYonConst.BudgetApplyConf.Code(); } + @Override + public Object compensateBacked(String targetId) { + TbsAffairCommitBo commitBo = new TbsAffairCommitBo(); + commitBo.setTargetId(targetId); + return doBacked(commitBo); + } } diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeOperationServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeOperationServiceImpl.java index 7b6653b3..efee9064 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeOperationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeOperationServiceImpl.java @@ -179,4 +179,9 @@ public class TbsBudgetChangeOperationServiceImpl implements SeeYonOperationServi return TbsSeeYonConst.BudgetChangeConf.Code(); } + @Override + public Object compensateBacked(String targetId) { + this.doBacked(new TbsAffairCommitBo(targetId)); + return null; + } } diff --git a/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java b/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java index 0bdb3b51..98da11ec 100644 --- a/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java @@ -345,6 +345,10 @@ public class TzcPolicyApplicationServiceImpl implements TzcPolicyApplicationServ Assert.throwEx(flowIdResult.getMsg()); } String flowId = flowIdResult.getData(); + //这里错误时会抛出json数据 + if(flowId!=null&&flowId.length()>60){ + Assert.throwEx("远程调用异常："+flowId); + } String formId = null; R formIdResult = seeYonService.getFormId(TbsSeeYonConst.PolicyConf.Code(),policyId); if(formIdResult.getStatus()==200){