From 636904beeccca5fd97ab128532c0b0bf6c158f16 Mon Sep 17 00:00:00 2001 From: hanlinghao <2969694837@qq.com> Date: Mon, 25 Apr 2022 10:24:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=9F=BA=E7=A1=80=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E7=BB=B4=E6=8A=A4=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=EF=BC=8C=E5=AE=A2=E6=88=B7=E5=88=9D=E5=A7=8B=E5=8C=96=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=AE=A2=E6=88=B7=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=E8=AF=A6=E6=83=85-=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppCrmCustomerTempBasicsDetailsVo.java | 113 ++++++++---- .../AppCrmCustomerTempInfoVo.java | 166 ++++-------------- .../crmcustomertemp/CrmCustomerTempFeign.java | 21 +-- .../CrmCustomerTempFeignFallback.java | 8 +- .../CrmCustomerTempMapper.java | 36 ++-- .../crmcustomertemp/CrmCustomerTempMapper.xml | 67 +++++-- .../crmcustomertemp/CrmCustomerTempRest.java | 26 +-- .../CrmCustomerTempService.java | 80 ++++----- 8 files changed, 251 insertions(+), 266 deletions(-) diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempBasicsDetailsVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempBasicsDetailsVo.java index ae36b8aebf..d4aa35ae91 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempBasicsDetailsVo.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempBasicsDetailsVo.java @@ -4,29 +4,73 @@ import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data public class AppCrmCustomerTempBasicsDetailsVo implements Vo { @ApiModelProperty("客户类型") - private String customerTypeKey; - - @ApiModelProperty("客户类型value") private String customerType; + @ApiModelProperty("客户类型") + private String customerTypeKey; + @ApiModelProperty("客户名称") private String name; @ApiModelProperty("联系电话") private String mobile; - @ApiModelProperty("微信号") - private String weiXin; + @ApiModelProperty("微信") + private String weixin; @ApiModelProperty("公司名称") private String companyName; - @ApiModelProperty("客户地址") - private String addressNss; + @ApiModelProperty("定位经纬度") + private String location; + + @ApiModelProperty("定位经纬度") + private String nowLocation; + + @ApiModelProperty("地址") + private String nowLocationStr; + + @ApiModelProperty("省code") + private String address_province; + + @ApiModelProperty("市code") + private String address_city; + + @ApiModelProperty("县code") + private String address_county; + + @ApiModelProperty("省") + private String province; + + @ApiModelProperty("市") + private String city; + + @ApiModelProperty("县") + private String county; + + @ApiModelProperty("区域代码") + private String adCode; + + @ApiModelProperty("是否开启提醒") + private String isOnRemind; + + @ApiModelProperty("是否开启提醒") + private String isOnRemindkey; + + @ApiModelProperty("提醒周期") + private String remind_day; + + @ApiModelProperty("提醒备注") + private String remind_remark; + + @ApiModelProperty("见证材料") + private List crmVisitFileList; @ApiModelProperty("详细地址") private String address; @@ -34,53 +78,62 @@ public class AppCrmCustomerTempBasicsDetailsVo implements Vo { @ApiModelProperty("客户级别") private String level; + @ApiModelProperty("客户级别") + private String levelKey; + @ApiModelProperty("客户生日") private String birthday; - @ApiModelProperty("性别") + @ApiModelProperty("客户性别") private String sex; + @ApiModelProperty("客户性别") + private String sexKey; + @ApiModelProperty("证件类型") - private String idType; + private String certificateType; - @ApiModelProperty("证件编码") - private String idNumber; + @ApiModelProperty("证件类型") + private String certificateTypeKey; + + @ApiModelProperty("证件号码") + private String IDNumber; @ApiModelProperty("证件有效期") - private String idDate; + private String endDate; @ApiModelProperty("电子邮箱") - private String email; + private String e_mail; @ApiModelProperty("紧急联系人") - private String name2; + private String emergencyContact; @ApiModelProperty("紧急联系电话") - private String mobile2; + private String emergencyMobile; - @ApiModelProperty("客户来源value") + @ApiModelProperty("客户来源") private String source; - @ApiModelProperty("客户分类value") - private String classification; - - @ApiModelProperty("客户类型value") - private String remarks; - - - - - - - - - + @ApiModelProperty("客户来源") + private String sourceKey; + @ApiModelProperty("客户分类") + private String customerClass; + @ApiModelProperty("客户分类") + private String customerClassKey; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("客户类型sid") + private String parentSid; + @ApiModelProperty("客户sid") + private String sid; + @ApiModelProperty("用户sid") + private String userSid; } diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempInfoVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempInfoVo.java index 9dd1d8a01b..63121369d5 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempInfoVo.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempInfoVo.java @@ -28,152 +28,46 @@ import java.util.List; @Data public class AppCrmCustomerTempInfoVo implements Vo { - @ApiModelProperty("潜在客户sid") - private String sid; - - @ApiModelProperty("parentSid（用于客户类型二级）") - private String parentSid; - - @ApiModelProperty("登录用户sid") - private String userSid; - - @ApiModelProperty("登录用户sid") - private String createBySid; - - @ApiModelProperty("业务人员sid") - private String staffSid; - - @ApiModelProperty("客户类型（自然人/法人）") - @NotBlank(message = "客户类型不能为空") + @ApiModelProperty("客户类型") private String customerType; - - @ApiModelProperty("客户类型key") - @NotBlank(message = "客户类型不能为空") + @ApiModelProperty("客户类型") private String customerTypeKey; - - @ApiModelProperty("客户名称") - @NotBlank(message = "客户名称不能为空") - private String name; - - @ApiModelProperty("客户头像") - private String customerPhoto; - + @ApiModelProperty("公司名称") + private String companyName; + @ApiModelProperty("微信") + private String weiXin; @ApiModelProperty("联系电话") private String mobile; - - @ApiModelProperty("微信号码") - private String weixin; - - @ApiModelProperty("所在公司名称") - private String companyName; - - @ApiModelProperty("区域代码") - private String adCode; - - @ApiModelProperty("行政区划代码（省）") - private String address_province; - - @ApiModelProperty("行政区划代码（市）") - private String address_city; - - @ApiModelProperty("行政区划代码（县）") - private String address_county; - - @ApiModelProperty("省") - private String province; - - @ApiModelProperty("市") - private String city; - - @ApiModelProperty("县") - private String county; - + @ApiModelProperty("紧急联系电话") + private String mobile2; + @ApiModelProperty("联系人") + private String name; + @ApiModelProperty("紧急联系联系人") + private String name2; @ApiModelProperty("详细地址") private String address; - - @ApiModelProperty("地址") + @ApiModelProperty("客户地址") private String addressNss; - - @ApiModelProperty("是否开启提醒（1开启，0不开启）") - private String isOnRemindkey; - - @ApiModelProperty("是否开启提醒（1开启，0不开启）") - private String isOnRemind; - - @ApiModelProperty("见面方式key") - @NotBlank(message = "见面方式不能为空") - private String visitWayKey; - - @ApiModelProperty("见面方式（到店/电话/拜访）") - @NotBlank(message = "见面方式不能为空") - private String visitWay; - - @ApiModelProperty("提醒日期") - private String remind_day; - - @ApiModelProperty("提醒备注") - private String remind_remark; - - // 修改信息字段 - @ApiModelProperty("客户分类（个人：司机/个体老板/其他。企业：企业型客户/一级经销商/二级经销商/终端物流客户）") - private String customerClass; - - @ApiModelProperty("客户分类key") - private String customerClassKey; - - @ApiModelProperty("客户来源（公司资源/自主开发/交接客户/转介绍客户/集团内销）") + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("客户分类") + private String classification; + @ApiModelProperty("客户来源") private String source; - - @ApiModelProperty("客户来源key") - private String sourceKey; - - @ApiModelProperty("客户级别（意向客户/准客户/成交客户/集团内销/黑名单客户）") - private String level; - - @ApiModelProperty("客户级别key") - private String levelKey; - - @ApiModelProperty("生日") - private String birthday; - + @ApiModelProperty("电子邮箱") + private String email; + @ApiModelProperty("证件有效期") + private String idDate; + @ApiModelProperty("证件号码") + private String idNumber; + @ApiModelProperty("证件类型") + private String idType; @ApiModelProperty("性别") private String sex; + @ApiModelProperty("客户生日") + private String birthday; + @ApiModelProperty("客户级别") + private String level; - @ApiModelProperty("性别key") - private String sexKey; - - @ApiModelProperty("证件类型key") - private String certificateTypeKey; - - @ApiModelProperty("证件类型（个人为身份证/企业为营业执照）") - private String certificateType; - - @ApiModelProperty("证件号码（个人为身份证号/企业为统一社会信用代码）") - @JsonProperty("IDNumber") - private String IDNumber; - - @ApiModelProperty("证件有效期") - private String endDate; - - @ApiModelProperty("紧急联系电话") - private String emergencyContact; - - @ApiModelProperty("紧急联系电话") - private String emergencyMobile; - - @ApiModelProperty("邮编") - private String zipCode; - - @ApiModelProperty("电子邮箱") - private String e_mail; - - @ApiModelProperty("备注") - private String remarks; - - @ApiModelProperty("身份证正反面") - private String filePath; - - @ApiModelProperty("身份证正反面list") - private List filePaths = Collections.emptyList(); } diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java index 097d1cb2c1..dd3febc774 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java @@ -114,26 +114,27 @@ public interface CrmCustomerTempFeign { @PostMapping("/getCustomerTempListByUserSid") public ResultBean> getCustomerTempListByUserSid(@RequestBody PagerQuery pagerQuery); - @ApiOperation("手机端根据sid查询潜在客户基础信息") + +// @ApiOperation("手机端根据sid查询潜在客户基础信息") +// @ResponseBody +// @GetMapping("/getAppCustomerTempInfoBySid") +// public ResultBean getAppCustomerTempInfoBySid(@RequestParam("sid") String sid); + + @ApiOperation("客户信息维护详情") @ResponseBody - @GetMapping("/getAppCustomerTempInfoBySid") - public ResultBean getAppCustomerTempInfoBySid(@RequestParam("sid") String sid); + @GetMapping("/customerTempDetailsBySid/{sid}") + public ResultBean customerTempDetailsBySid(@PathVariable("sid") String sid); - @ApiOperation("手机端获取潜在客户详情") + @ApiOperation("初始化客户详情") @ResponseBody @GetMapping("/getAppCustomerTempDetails") public ResultBean getAppCustomerTempDetails(@RequestParam("userSid") String userSid, @RequestParam("sid") String sid); - @ApiOperation("根据sid获取潜在客户信息") + @ApiOperation("初始化客户详情基础信息详情") @ResponseBody @GetMapping("/getAppCustomerTempDetailsBySid") public ResultBean getAppCustomerTempDetailsBySid(@RequestParam("sid") String sid); - @ApiOperation("手机端-获取客户基础信息（新）") - @ResponseBody - @GetMapping("/customerTempDetailsBySid/{sid}") - public ResultBean customerTempDetailsBySid(@PathVariable("sid") String sid); - @ApiOperation("初始化客户档案") @ResponseBody @GetMapping("/initCustomerArchives/{customerSid}/{userSid}") diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java index 5947c6e3aa..a3c297fb36 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java @@ -80,10 +80,10 @@ public class CrmCustomerTempFeignFallback implements CrmCustomerTempFeign { return null; } - @Override - public ResultBean getAppCustomerTempInfoBySid(String sid) { - return null; - } +// @Override +// public ResultBean getAppCustomerTempInfoBySid(String sid) { +// return null; +// } @Override public ResultBean getAppCustomerTempDetails(String userSid,String sid) { diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java index 280e99b381..bb8a60a2af 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java @@ -59,22 +59,7 @@ public interface CrmCustomerTempMapper extends BaseMapper { */ IPage getCustomerTempListByUserSid(IPage page, @Param("staffSid") String staffSid, @Param("name") String name); - /** - * 手机端获取潜在客户详情 - * - * @param sid - * @param staffSid - * @return - */ - AppCrmCustomerTempVo getAppCustomerTempDetails(@Param("sid") String sid, @Param("staffSid") String staffSid); - /** - * 手机端根据sid查询潜在客户基础信息 - * - * @param sid - * @return - */ - AppCrmCustomerTempInfoVo getAppCustomerTempDetailsBySid(String sid); CrmCustomerTempVo selectByMobileOrWx(Map map); @@ -105,10 +90,27 @@ public interface CrmCustomerTempMapper extends BaseMapper { CrmCustomerTempVo selectByWx(@Param("orgSid") String orgSid, @Param("staffSid") String staffSid, @Param("weixin") String weixin); /** - * 获取客户基础信息 + * 客户信息维护 - 详情接口 + * + * @param sid + * @return + */ + AppCrmCustomerTempBasicsDetailsVo customerTempDetailsBySid(@Param("sid") String sid); + + /** + * 初始化客户详情 + * + * @param sid + * @param staffSid + * @return + */ + AppCrmCustomerTempVo getAppCustomerTempDetails(@Param("sid") String sid, @Param("staffSid") String staffSid); + + /** + * 初始化客户详情 - 基础信息接口 * * @param sid * @return */ - AppCrmCustomerTempBasicsDetailsVo customerTempDetailsBySid(String sid); + AppCrmCustomerTempInfoVo getAppCustomerTempDetailsBySid(@Param("sid") String sid); } \ No newline at end of file diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml index be8f84654e..520ce94039 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml @@ -107,14 +107,6 @@ WHERE sid = #{sid} AND staffSid = #{staffSid} - + + + \ No newline at end of file diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java index 6163d0c66f..a0700be3d0 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java @@ -179,36 +179,38 @@ public class CrmCustomerTempRest implements CrmCustomerTempFeign { * @param sid * @return */ - @Override - public ResultBean getAppCustomerTempInfoBySid(String sid) { - return crmCustomerTempService.getAppCustomerTempInfoBySid(sid); - } +// @Override +// public ResultBean getAppCustomerTempInfoBySid(String sid) { +// return crmCustomerTempService.getAppCustomerTempInfoBySid(sid); +// } + + /** - * 手机端获取潜在客户详情 + * 初始化客户详情 - 基础信息接口 * - * @param userSid * @param sid * @return */ @Override - public ResultBean getAppCustomerTempDetails(String userSid, String sid) { - return crmCustomerTempService.getAppCustomerTempDetails(userSid, sid); + public ResultBean getAppCustomerTempDetailsBySid(String sid) { + return crmCustomerTempService.getAppCustomerTempDetailsBySid(sid); } /** - * 根据sid获取潜在客户信息 + * 初始化客户详情 * + * @param userSid * @param sid * @return */ @Override - public ResultBean getAppCustomerTempDetailsBySid(String sid) { - return crmCustomerTempService.getAppCustomerTempDetailsBySid(sid); + public ResultBean getAppCustomerTempDetails(String userSid, String sid) { + return crmCustomerTempService.getAppCustomerTempDetails(userSid, sid); } /** - * 获取客户基础信息 + * 客户信息维护 - 详情接口 * * @param sid * @return diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java index 32ead98237..465facad81 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java @@ -12,7 +12,9 @@ import com.yxt.anrui.crm.api.crmbusiness.CrmBusinessDto; import com.yxt.anrui.crm.api.crmbusiness.CrmBusinessVo; import com.yxt.anrui.crm.api.crmcustomerfile.CrmCustomerFileVo; import com.yxt.anrui.crm.api.crmcustomertemp.*; +import com.yxt.anrui.crm.api.crmfile.CrmFile; import com.yxt.anrui.crm.api.crmfile.CrmFileAttachTypeEnum; +import com.yxt.anrui.crm.api.crmfile.CrmFileDetailsVo; import com.yxt.anrui.crm.api.crmvehicledemand.AppCrmVehicledemandVo; import com.yxt.anrui.crm.api.crmvisit.AppCrmVisitThumbDetailsVo; import com.yxt.anrui.crm.api.crmvisit.PcCrmVisitAppendixDto; @@ -353,34 +355,34 @@ public class CrmCustomerTempService extends MybatisBaseService getAppCustomerTempInfoBySid(String sid) { - AppCrmCustomerTempInfoVo saveInfoVo = baseMapper.getAppCustomerTempDetailsBySid(sid); - saveInfoVo.setAdCode(saveInfoVo.getAddress_province() + saveInfoVo.getAddress_city() + saveInfoVo.getAddress_county()); - saveInfoVo.setUserSid(saveInfoVo.getCreateBySid()); - String customerTypeKey = saveInfoVo.getCustomerTypeKey(); - String parentSid = dictCommonFeign.selectBykey(customerTypeKey, DictCommonType.CUSTOMER_TYPE).getData().getSid(); - saveInfoVo.setParentSid(parentSid); - List filePaths = new ArrayList<>(); - if (StringUtils.isNotBlank(saveInfoVo.getFilePath())) { - String[] list = saveInfoVo.getFilePath().split(","); - for (String str : list) { - filePaths.add(fileUploadComponent.getUrlPrefix() + str); - } - } - saveInfoVo.setFilePath(""); - saveInfoVo.setFilePaths(filePaths); - return new ResultBean().success().setData(saveInfoVo); - } +// /** +// * 手机端根据sid查询潜在客户基础信息 +// * +// * @param sid +// * @return +// */ +// public ResultBean getAppCustomerTempInfoBySid(String sid) { +// AppCrmCustomerTempInfoVo saveInfoVo = baseMapper.getAppCustomerTempDetailsBySid(sid); +// saveInfoVo.setAdCode(saveInfoVo.getAddress_province() + saveInfoVo.getAddress_city() + saveInfoVo.getAddress_county()); +// saveInfoVo.setUserSid(saveInfoVo.getCreateBySid()); +// String customerTypeKey = saveInfoVo.getCustomerTypeKey(); +// String parentSid = dictCommonFeign.selectBykey(customerTypeKey, DictCommonType.CUSTOMER_TYPE).getData().getSid(); +// saveInfoVo.setParentSid(parentSid); +// List filePaths = new ArrayList<>(); +// if (StringUtils.isNotBlank(saveInfoVo.getFilePath())) { +// String[] list = saveInfoVo.getFilePath().split(","); +// for (String str : list) { +// filePaths.add(fileUploadComponent.getUrlPrefix() + str); +// } +// } +// saveInfoVo.setFilePath(""); +// saveInfoVo.setFilePaths(filePaths); +// return new ResultBean().success().setData(saveInfoVo); +// } /** - * 手机端获取潜在客户详情 + * 初始化客户详情 * * @param userSid * @param sid @@ -456,26 +458,13 @@ public class CrmCustomerTempService extends MybatisBaseService getAppCustomerTempDetailsBySid(String sid) { AppCrmCustomerTempInfoVo appCrmCustomerTempInfoVo = baseMapper.getAppCustomerTempDetailsBySid(sid); - String province = appCrmCustomerTempInfoVo.getProvince(); - String city = appCrmCustomerTempInfoVo.getCity(); - String county = appCrmCustomerTempInfoVo.getCounty(); - appCrmCustomerTempInfoVo.setAddressNss(province + city + county); - List filePaths = new ArrayList<>(); - if (StringUtils.isNotBlank(appCrmCustomerTempInfoVo.getFilePath())) { - String[] list = appCrmCustomerTempInfoVo.getFilePath().split(","); - for (String str : list) { - filePaths.add(fileUploadComponent.getUrlPrefix() + str); - } - } - appCrmCustomerTempInfoVo.setFilePath(""); - appCrmCustomerTempInfoVo.setFilePaths(filePaths); return new ResultBean().success().setData(appCrmCustomerTempInfoVo); } @@ -778,13 +767,24 @@ public class CrmCustomerTempService extends MybatisBaseService crmFileDetailsVos = crmFileService.fetchByLinkSid(sid); + List list = new ArrayList<>(); + if (crmFileDetailsVos != null) { + for (CrmFileDetailsVo crmFileDetailsVo : crmFileDetailsVos) { + String filePath = crmFileDetailsVo.getFilePath(); + list.add(fileUploadComponent.getUrlPrefix() + filePath); + } + } + vo.setCrmVisitFileList(list); return vo; } } \ No newline at end of file