diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/CrmVisitRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/CrmVisitRest.java index 0db1b49..d2a40d1 100644 --- a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/CrmVisitRest.java +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/CrmVisitRest.java @@ -130,7 +130,7 @@ public class CrmVisitRest { if (!b) { return rb.setMsg("修改失败"); } - ResultBean delFiles = crmFileFeign.deleteFiles(sid); + ResultBean delFiles = crmFileFeign.deleteFiles(sid,"0004"); if (delFiles != null) { List pcCrmvisitAppendixDtos = dto.getList(); for (PcCrmVisitAppendixDto pcCrmvisitAppendixDto : pcCrmvisitAppendixDtos) { diff --git a/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/CrmCustomerTempDto.java b/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/CrmCustomerTempDto.java index bbe35a3..edc609e 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/CrmCustomerTempDto.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/CrmCustomerTempDto.java @@ -4,6 +4,7 @@ package com.yxt.oms.biz.func.crmcustomer; import com.yxt.common.core.dto.Dto; import com.yxt.oms.biz.func.crmvisit.PcCrmVisitAppendixDto; +import com.yxt.oms.utils.FileQueryUrl; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -135,6 +136,9 @@ public class CrmCustomerTempDto implements Dto { @ApiModelProperty(value = "见证材料的集合,编辑保存时无此字段") private List crmVisitAppendixDtoList = new ArrayList<>(); + //客户档案 + @ApiModelProperty(value = "客户档案") + private List customerFiles = new ArrayList<>(); private String orgPath; private String useOrgSid; diff --git a/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/CrmCustomerTempService.java b/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/CrmCustomerTempService.java index e2b1f67..fb81c9d 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/CrmCustomerTempService.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/CrmCustomerTempService.java @@ -7,6 +7,9 @@ import com.yxt.common.base.utils.HttpStatusEnum; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.crmfile.CommonAppendixSelectQuery; +import com.yxt.oms.biz.func.crmfile.CommonAppendixVo; +import com.yxt.oms.biz.func.crmfile.CommonAttachTypeEnum; import com.yxt.oms.biz.func.crmfile.PcCommonAppendixDto; import com.yxt.oms.biz.func.crmvisit.CrmVisitService; import com.yxt.oms.biz.func.crmvisit.PcCrmVisitAppendixDto; @@ -20,6 +23,7 @@ import com.yxt.oms.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.oms.feign.portal.sysstafforg.SysStaffOrgFeign; import com.yxt.oms.feign.portal.sysuser.SysUserFeign; import com.yxt.oms.feign.portal.sysuser.SysUserVo; +import com.yxt.oms.utils.FileQueryUrl; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -189,6 +193,22 @@ public class CrmCustomerTempService { } crmFileFeign.saveCommonAppendix(visitSid, pcCommonAppendixDtoList); } + // 增加客户档案附件信息 + if (dto.getCustomerFiles().size() != 0) { + List pcCommonAppendixDtoList = new ArrayList<>(); + List list = dto.getCustomerFiles(); + for (int i = 0; i < list.size(); i++) { + PcCommonAppendixDto pcCommonAppendixDto = new PcCommonAppendixDto(); + FileQueryUrl url = list.get(i); + if (StringUtils.isNotBlank(dto.getUserSid())) { + pcCommonAppendixDto.setCreateBySid(dto.getUserSid()); + } + pcCommonAppendixDto.setFilePath(url.getUrl()); + pcCommonAppendixDtoList.add(pcCommonAppendixDto); + } + crmFileFeign.saveAppendix(visitSid, CommonAttachTypeEnum.CUSTOMER_FILE.getAttachType(), pcCommonAppendixDtoList); + } + return crmCustomerTemp; } @@ -255,6 +275,23 @@ public class CrmCustomerTempService { customerTemp.setUseOrgSid(dto.getUseOrgSid()); } crmCustomerTempFeign.updateEntity(customerTemp); + crmFileFeign.deleteFiles(sid, CommonAttachTypeEnum.CUSTOMER_FILE.getAttachType()); + // 增加客户档案附件信息 + if (dto.getCustomerFiles().size() != 0) { + List pcCommonAppendixDtoList = new ArrayList<>(); + List list = dto.getCustomerFiles(); + for (int i = 0; i < list.size(); i++) { + PcCommonAppendixDto pcCommonAppendixDto = new PcCommonAppendixDto(); + FileQueryUrl url = list.get(i); + if (StringUtils.isNotBlank(dto.getUserSid())) { + pcCommonAppendixDto.setCreateBySid(dto.getUserSid()); + } + pcCommonAppendixDto.setFilePath(url.getUrl()); + pcCommonAppendixDtoList.add(pcCommonAppendixDto); + } + crmFileFeign.saveAppendix(sid, CommonAttachTypeEnum.CUSTOMER_FILE.getAttachType(), pcCommonAppendixDtoList); + } + return rb.success(); } @@ -267,6 +304,19 @@ public class CrmCustomerTempService { CrmCustomerTempVo vo = new CrmCustomerTempVo(); CrmCustomerTemp crmCustomerTemp = this.fetchBySid(sid); BeanUtil.copyProperties(crmCustomerTemp, vo); + CommonAppendixSelectQuery appendixSelectQuery = new CommonAppendixSelectQuery(); + appendixSelectQuery.setLinkSid(sid); + appendixSelectQuery.setAttachType(CommonAttachTypeEnum.CUSTOMER_FILE.getAttachType()); + List appendixVos = crmFileFeign.getPcAppendix(appendixSelectQuery).getData(); + if (!appendixVos.isEmpty() && appendixVos.size() > 0) { + List list = new ArrayList<>(); + for (CommonAppendixVo appendixVo : appendixVos) { + FileQueryUrl queryUrl = new FileQueryUrl(); + queryUrl.setUrl(appendixVo.getFilePath()); + list.add(queryUrl); + } + vo.setCustomerFiles(list); + } return vo; } } diff --git a/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/CrmCustomerTempUpdateDto.java b/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/CrmCustomerTempUpdateDto.java index 8957ce4..bb1e8e4 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/CrmCustomerTempUpdateDto.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/CrmCustomerTempUpdateDto.java @@ -1,11 +1,14 @@ package com.yxt.oms.biz.func.crmcustomer; import com.yxt.common.core.dto.Dto; +import com.yxt.oms.utils.FileQueryUrl; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Pattern; +import java.util.ArrayList; +import java.util.List; /** * @Author dimengzhe @@ -107,6 +110,10 @@ public class CrmCustomerTempUpdateDto implements Dto { @ApiModelProperty(value = "备注") private String remarks; + //客户档案 + @ApiModelProperty(value = "客户档案") + private List customerFiles = new ArrayList<>(); + private String orgPath; private String useOrgSid; private String customerOrgSid; diff --git a/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/CrmCustomerTempVo.java b/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/CrmCustomerTempVo.java index 753353f..aa422ce 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/CrmCustomerTempVo.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/CrmCustomerTempVo.java @@ -3,11 +3,14 @@ package com.yxt.oms.biz.func.crmcustomer; import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; +import com.yxt.oms.utils.FileQueryUrl; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; import java.util.Date; +import java.util.List; /** * Project: anrui-crm(客户管理)
@@ -183,7 +186,9 @@ public class CrmCustomerTempVo implements Vo { @ApiModelProperty("跟进记录数量") private String gjcounts; - + //客户档案 + @ApiModelProperty(value = "客户档案") + private List customerFiles = new ArrayList<>(); private String useOrgSid; private String customerOrgSid; diff --git a/oms/src/main/java/com/yxt/oms/feign/customer/crmfile/CrmFileFeign.java b/oms/src/main/java/com/yxt/oms/feign/customer/crmfile/CrmFileFeign.java index 64823e5..0984607 100644 --- a/oms/src/main/java/com/yxt/oms/feign/customer/crmfile/CrmFileFeign.java +++ b/oms/src/main/java/com/yxt/oms/feign/customer/crmfile/CrmFileFeign.java @@ -49,10 +49,14 @@ public interface CrmFileFeign { @ApiOperation(value = "批量删除文件") @PostMapping("/deleteFiles") - ResultBean deleteFiles(@RequestParam(value = "linkSid") String linkSid); + ResultBean deleteFiles(@RequestParam(value = "linkSid") String linkSid,@RequestParam(value = "attachType") String attachType); @ApiOperation("Pc端查询附件") @PostMapping("/getPcAppendix") public ResultBean> getPcAppendix(@RequestBody CommonAppendixSelectQuery query); + @ApiOperation("附件保存") + @PostMapping("/saveAppendix") + ResultBean saveAppendix(@RequestParam(value = "linkSid") String linkSid,@RequestParam(value = "attachType") String attachType, @RequestBody List list); + }