From 8fa09b8006a7e8107e768ee055fa54e3ddbb5bde Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 13 Apr 2023 18:13:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/busdelivered/AppDeliveredDetailsVo.java | 2 ++ .../busdeliveredapply/AppDeliveredApplyDto.java | 3 ++- .../api/busdeliveredapply/BusDeliveredApply.java | 4 ++-- .../biz/busdelivered/BusDeliveredService.java | 8 ++++++-- .../BusDeliveredApplyService.java | 14 +++++++++++++- .../autoservice/retrieval/DeliveredApplyDto.java | 2 ++ .../autoservice/retrieval/DeliveredDetailsVo.java | 6 ++++-- doc/databases/bus-center_tables.sql | 1 + 8 files changed, 32 insertions(+), 8 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsVo.java index 26516198cc..e470567c18 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsVo.java @@ -26,6 +26,8 @@ public class AppDeliveredDetailsVo implements Vo { private String createTime; @ApiModelProperty("销售专员") private String staffName; + @ApiModelProperty("客户sid") + private String customerSid; @ApiModelProperty("客户名称") private String name; @ApiModelProperty("客户电话") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppDeliveredApplyDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppDeliveredApplyDto.java index 1553073a5b..df1069fb58 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppDeliveredApplyDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppDeliveredApplyDto.java @@ -24,7 +24,8 @@ public class AppDeliveredApplyDto implements Dto { private String staffName; @ApiModelProperty("发起日期") private String createTime; - + @ApiModelProperty("客户sid") + private String customerSid; @ApiModelProperty("客户名称") private String name; @ApiModelProperty("客户电话") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApply.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApply.java index 4a4078e97a..e40fd56915 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApply.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApply.java @@ -54,6 +54,8 @@ public class BusDeliveredApply extends BaseEntity { private String contractNo; @ApiModelProperty("单据编号") private String billNo; + @ApiModelProperty("客户sid") + private String customerSid; @ApiModelProperty("客户名称") private String name; @ApiModelProperty("车型Sid") @@ -72,8 +74,6 @@ public class BusDeliveredApply extends BaseEntity { private String applySid; @ApiModelProperty(value = "分公司sid") private String useOrgSid; - /* @ApiModelProperty("是否是终端:1是，0不是") - private Integer isTerminal;*/ @ApiModelProperty(value = "客户手机号") private String mobile; @ApiModelProperty(value = "节点状态") diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java index 845d74a000..d1acc6d8a6 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java @@ -302,6 +302,7 @@ public class BusDeliveredService extends MybatisBaseService crmCustomerTempResultBean = crmCustomerTempFeign.fetchSid(customerSid); + + } + if ("1".equals(busDeliveredApply.getTypeKey())) { + //贷款人的信息 + String loanSid = busDeliveredApply.getLoanSid(); + ResultBean crmCustomerTempResultBean = crmCustomerTempFeign.fetchSid(loanSid); + + } busDeliveredApplyDetailsService.insert(busDeliveredApplyDetails); @@ -1295,7 +1307,7 @@ public class BusDeliveredApplyService extends MybatisBaseService voResultBean = flowableFeign.startProcess(bv); - if(!voResultBean.getSuccess()){ + if (!voResultBean.getSuccess()) { return rb.setMsg(voResultBean.getMsg()); } UpdateFlowFieldVo ufVo = voResultBean.getData(); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyDto.java index 47ff0fadb2..e0626175c8 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyDto.java @@ -34,6 +34,8 @@ public class DeliveredApplyDto implements Dto { @ApiModelProperty("发起日期") @JsonProperty("date") private String createTime; + @ApiModelProperty("客户sid") + private String customerSid; @ApiModelProperty("客户名称") private String name; @ApiModelProperty("客户电话") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredDetailsVo.java index a4bcdcdbb6..6c9ff8c4e0 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredDetailsVo.java @@ -34,6 +34,8 @@ public class DeliveredDetailsVo implements Vo { @ApiModelProperty("发起日期") @JsonProperty("date") private String createTime; + @ApiModelProperty("客户sid") + private String customerSid; @ApiModelProperty("客户名称") private String name; @ApiModelProperty("客户电话") @@ -72,8 +74,8 @@ public class DeliveredDetailsVo implements Vo { private String loanMobile; @ApiModelProperty("总备注") private String remarks; - /* @ApiModelProperty("用户sid") - private String userSid;*/ + @ApiModelProperty("用户sid") + private String userSid; @ApiModelProperty("记录sid") private String sid; @ApiModelProperty("orgPath") diff --git a/doc/databases/bus-center_tables.sql b/doc/databases/bus-center_tables.sql index 413df61c83..ffbca9585b 100644 --- a/doc/databases/bus-center_tables.sql +++ b/doc/databases/bus-center_tables.sql @@ -327,6 +327,7 @@ CREATE TABLE `bus_delivered_use_message` `remarks` varchar(255) DEFAULT NULL COMMENT '备注', `createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid', `updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid', + `customerSid` varchar(64) DEFAULT NULL COMMENT '客户sid', `name` varchar(64) DEFAULT NULL COMMENT '客户名称', `mobile` VARCHAR(200) DEFAULT NULL COMMENT '联系电话', `idNo` VARCHAR(200) DEFAULT NULL COMMENT '证件号码',