From 48549323d097a3bac8c93b8e4e52f248b4e5d988 Mon Sep 17 00:00:00 2001 From: Yen Date: Fri, 24 Feb 2023 17:32:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=96=B0=E7=89=88=E8=87=B4?= =?UTF-8?q?=E8=BF=9C=E6=9C=8D=E5=8A=A1=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serve/modules/seeyon/service/SeeYonService.java | 11 +++-------- .../seeyon/service/impl/SeeYonServiceImpl.java | 10 ++-------- .../qs/serve/modules/tbs/common/TbsSeeYonConst.java | 1 + .../tbs/service/impl/TbsCostApplyServiceImpl.java | 2 +- .../modules/tzc/service/TzcPolicyApplication.java | 2 +- .../vtb/service/impl/VtbVerificationServiceImpl.java | 2 +- 6 files changed, 9 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonService.java b/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonService.java index 48a73836..3fceda67 100644 --- a/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonService.java +++ b/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonService.java @@ -39,17 +39,12 @@ public interface SeeYonService { /** * 获取表单id - * @param costApplyId + * @param templateCode + * @param targetId * @return */ - R getCostFormId(Long costApplyId); + R getFormId(String templateCode,Long targetId); - /** - * 获取表单id - * @param checkId - * @return - */ - R getCheckFormId(Long checkId); /** * 提交 diff --git a/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonServiceImpl.java b/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonServiceImpl.java index 2d6599ad..750a2151 100644 --- a/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonServiceImpl.java @@ -90,18 +90,12 @@ public class SeeYonServiceImpl implements SeeYonService { } @Override - public R getCostFormId(Long costApplyId) { + public R getFormId(String templateCode, Long targetId) { String title = "获取表单ID"; - String url2 = TbsSeeYonConst.API_GET_COST_FORM_ID+"?costApplyId="+costApplyId; + String url2 = TbsSeeYonConst.API_GET_FORM_ID+"?templateCode="+templateCode+"&targetId="+targetId; return syBaseService.getBase(url2,title); } - @Override - public R getCheckFormId(Long checkId) { - String title = "获取表单ID"; - String url2 = TbsSeeYonConst.API_GET_CHECK_FORM_ID+"?checkId="+checkId; - return syBaseService.getBase(url2,title); - } @Override public R affairCommit(CtpAffairCommit affairCommit) { diff --git a/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java b/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java index c90a8bf0..328f6c30 100644 --- a/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java +++ b/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java @@ -46,6 +46,7 @@ public interface TbsSeeYonConst { String API_PROCESS_CREATE_CALLBACK = "/process/createCallback"; String API_PROCESS_COMMIT = "/process/commit"; String API_PROCESS_CANCEL = "/process/cancel"; + String API_GET_FORM_ID = "/process/getFormId"; String API_GET_COST_FORM_ID = "/process/getCostApplyFormId"; String API_GET_CHECK_FORM_ID = "/process/getCheckFormId"; String API_PAGE_AFFAIR = "/process/pageMemberAffair"; diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java index ca24941c..a25f5fd6 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java @@ -100,7 +100,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl formIdResult = seeYonService.getCostFormId(tbsCostApply.getId()); + R formIdResult = seeYonService.getFormId(TbsSeeYonConst.CostApplyConf.Code(),tbsCostApply.getId()); if(formIdResult.getStatus()==200){ formId = formIdResult.getData(); } diff --git a/src/main/java/com/qs/serve/modules/tzc/service/TzcPolicyApplication.java b/src/main/java/com/qs/serve/modules/tzc/service/TzcPolicyApplication.java index 347d8b59..c3ee94a4 100644 --- a/src/main/java/com/qs/serve/modules/tzc/service/TzcPolicyApplication.java +++ b/src/main/java/com/qs/serve/modules/tzc/service/TzcPolicyApplication.java @@ -107,7 +107,7 @@ public class TzcPolicyApplication { } String flowId = flowIdResult.getData(); String formId = null; - R formIdResult = seeYonService.getCostFormId(policyId); + R formIdResult = seeYonService.getFormId(TbsSeeYonConst.PolicyConf.Code(),policyId); if(formIdResult.getStatus()==200){ formId = formIdResult.getData(); } diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java index e8f72eee..20a46f95 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java @@ -327,7 +327,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl formIdResult = seeYonService.getCheckFormId(verification.getId()); + R formIdResult = seeYonService.getFormId(TbsSeeYonConst.CostCheckConf.Code(),verification.getId()); if(formIdResult.getStatus()==200){ formId = formIdResult.getData(); }