From b08c4db52b2526bcc87f3a45746666aba6daf332 Mon Sep 17 00:00:00 2001 From: Yen Date: Wed, 27 Dec 2023 17:42:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E6=9D=A1=E6=AC=BE=E5=85=B3?= =?UTF-8?q?=E8=81=94OA=E6=B5=81=E6=B0=B4=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/qs/serve/modules/tbs/common/TbsSeeYonConst.java | 3 +++ .../com/qs/serve/modules/tbs/entity/TbsCostTodo.java | 3 +++ .../service/impl/TbsCostTodoOperationServiceImpl.java | 9 +++++++++ .../modules/tzc/controller/TzcPolicyItemController.java | 4 ++++ 4 files changed, 19 insertions(+) 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 76a50592..8bd192fd 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 @@ -84,6 +84,9 @@ public interface TbsSeeYonConst { String OA_USER_INFO = "/process/getUserByCode"; String OA_USER_LIST_1 = "/process/getUsersList"; + /** 获取流水号 */ + String API_FLOW_CODE_TODO = "/process/getTodoFlowCode?todoId="; + String TASK_SYNC_DISPATCH = "/task/dispatch"; /** 客户账单余额 */ diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostTodo.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostTodo.java index cc53a493..33320255 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostTodo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostTodo.java @@ -53,6 +53,9 @@ public class TbsCostTodo implements Serializable { /** 致远表单id */ private String syFormId; + /** 致远表单流水号 */ + private String syFlowCode; + /** 涉及品牌 */ @Length(max = 255,message = "涉及品牌长度不能超过255字") private String brands; diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostTodoOperationServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostTodoOperationServiceImpl.java index e21702d3..84a7873f 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostTodoOperationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostTodoOperationServiceImpl.java @@ -13,6 +13,7 @@ import com.qs.serve.modules.seeyon.entity.BaseCreateCallbackBo; import com.qs.serve.modules.seeyon.entity.BaseCreateProcessBo; import com.qs.serve.modules.seeyon.service.SeeYonOperationService; import com.qs.serve.modules.seeyon.service.SeeYonRequestService; +import com.qs.serve.modules.seeyon.service.impl.SeeYonRequestBaseService; import com.qs.serve.modules.sys.entity.SysUser; import com.qs.serve.modules.sys.mapper.SysUserMapper; import com.qs.serve.modules.tbs.common.TbsCommonCheckState; @@ -50,6 +51,7 @@ public class TbsCostTodoOperationServiceImpl implements SeeYonOperationService { private final SysUserMapper sysUserMapper; private final ProjectProperties projectProperties; private final SeeYonRequestService seeYonService; + private final SeeYonRequestBaseService seeYonRequestBaseService; /** * 提交 @@ -98,6 +100,13 @@ public class TbsCostTodoOperationServiceImpl implements SeeYonOperationService { BaseCreateCallbackBo callbackBo = new BaseCreateCallbackBo(TbsSeeYonConst.CheckCostAgreeConf.Code(),param.getId()+""); seeYonService.createCallbackStatus(callbackBo); + //流水号 + R codeRs = seeYonRequestBaseService.getBase(TbsSeeYonConst.API_FLOW_CODE_TODO+todoId,"获取条款申请流水号"); + if(codeRs!=null && codeRs.getData()!=null){ + String flowCode = codeRs.getData().toString(); + costTodo.setSyFlowCode(flowCode); + } + costTodo.setCheckStatus(TbsCommonCheckState.State_1_apply); costTodo.setSubmitTime(LocalDateTime.now()); costTodo.setSyFormId(formId); diff --git a/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyItemController.java b/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyItemController.java index 1e00b33d..e8186c75 100644 --- a/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyItemController.java +++ b/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyItemController.java @@ -56,6 +56,10 @@ public class TzcPolicyItemController { for (TzcPolicyItem policyItem : list) { List policyGoodsList = tzcPolicyGoodsService.listByItemId(policyItem.getId()); policyItem.setPolicyGoodsList(policyGoodsList); + if(policyItem.getAttachIds()!=null&&policyItem.getAttachIds().length>0){ + List attachList = attachService.listByIds(Arrays.asList(policyItem.getAttachIds())); + policyItem.setAttachList(attachList); + } } return R.ok(list); }