From c90c2dbb4f7623abb65dc8d4b99a808850610cfc Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Mon, 12 Aug 2024 14:23:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E4=BA=AB=E9=80=9A=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiadmin/aggregation/CrmVisitRest.java | 6 ++- .../crmcustomer/CrmCustomerTempService.java | 7 +-- .../oms/biz/func/crmfile/CrmFileService.java | 12 ++++- .../smssalesbill/SmsSalesBillService.java | 54 ++++++++++++++++++- 4 files changed, 71 insertions(+), 8 deletions(-) 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 d2a40d1..7e10bd7 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 @@ -1,6 +1,7 @@ package com.yxt.oms.apiadmin.aggregation; import cn.hutool.core.bean.BeanUtil; +import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.utils.DateUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -45,7 +46,8 @@ public class CrmVisitRest { private CrmCustomerTempFeign crmCustomerTempFeign; @Autowired private CrmFileFeign crmFileFeign; - + @Autowired + private FileUploadComponent fileUploadComponent; /** * pc端某客户的跟进记录分页列表 @@ -85,6 +87,7 @@ public class CrmVisitRest { String sid = entity.getSid(); String staffSid = dto.getStaffSid(); BeanUtil.copyProperties(pcCrmvisitAppendixDto, pcCommonAppendixDto); + pcCommonAppendixDto.setFilePath(pcCrmvisitAppendixDto.getFilePath().replace(fileUploadComponent.getUrlPrefix(), "")); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String createTime = simpleDateFormat.format(new Date()); if (dto.getList().size() != 0) { @@ -137,6 +140,7 @@ public class CrmVisitRest { PcCommonAppendixDto pcCommonAppendixDto = new PcCommonAppendixDto(); String staffSid = dto.getStaffSid(); BeanUtil.copyProperties(pcCrmvisitAppendixDto, pcCommonAppendixDto); + pcCommonAppendixDto.setFilePath(pcCrmvisitAppendixDto.getFilePath().replace(fileUploadComponent.getUrlPrefix(), "")); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String createTime = simpleDateFormat.format(new Date()); if (dto.getList().size() != 0) { 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 515f5bf..9e540f1 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 @@ -193,6 +193,7 @@ public class CrmCustomerTempService { PcCommonAppendixDto pcCommonAppendixDto = new PcCommonAppendixDto(); PcCrmVisitAppendixDto pcCrmVisitAppendixDto = list.get(i); BeanUtils.copyProperties(pcCrmVisitAppendixDto, pcCommonAppendixDto); + pcCommonAppendixDto.setFilePath(pcCrmVisitAppendixDto.getFilePath().replace(fileUploadComponent.getUrlPrefix(), "")); pcCommonAppendixDtoList.add(pcCommonAppendixDto); } crmFileFeign.saveCommonAppendix(visitSid, pcCommonAppendixDtoList); @@ -207,7 +208,7 @@ public class CrmCustomerTempService { if (StringUtils.isNotBlank(dto.getUserSid())) { pcCommonAppendixDto.setCreateBySid(dto.getUserSid()); } - pcCommonAppendixDto.setFilePath(url.getUrl()); + pcCommonAppendixDto.setFilePath(url.getUrl().replace(fileUploadComponent.getUrlPrefix(), "")); pcCommonAppendixDtoList.add(pcCommonAppendixDto); } crmFileFeign.saveAppendix(visitSid, CommonAttachTypeEnum.CUSTOMER_FILE.getAttachType(), pcCommonAppendixDtoList); @@ -290,7 +291,7 @@ public class CrmCustomerTempService { if (StringUtils.isNotBlank(dto.getUserSid())) { pcCommonAppendixDto.setCreateBySid(dto.getUserSid()); } - pcCommonAppendixDto.setFilePath(url.getUrl()); + pcCommonAppendixDto.setFilePath(url.getUrl().replace(fileUploadComponent.getUrlPrefix(), "")); pcCommonAppendixDtoList.add(pcCommonAppendixDto); } crmFileFeign.saveAppendix(sid, CommonAttachTypeEnum.CUSTOMER_FILE.getAttachType(), pcCommonAppendixDtoList); @@ -316,7 +317,7 @@ public class CrmCustomerTempService { List list = new ArrayList<>(); for (CommonAppendixVo appendixVo : appendixVos) { FileQueryUrl queryUrl = new FileQueryUrl(); - queryUrl.setUrl(appendixVo.getFilePath()); + queryUrl.setUrl(fileUploadComponent.getUrlPrefix() + appendixVo.getFilePath()); list.add(queryUrl); } vo.setCustomerFiles(list); diff --git a/oms/src/main/java/com/yxt/oms/biz/func/crmfile/CrmFileService.java b/oms/src/main/java/com/yxt/oms/biz/func/crmfile/CrmFileService.java index 57d86eb..b3f20b3 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/crmfile/CrmFileService.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/crmfile/CrmFileService.java @@ -58,14 +58,22 @@ import java.util.List; * @since 1.0 */ @Service -public class CrmFileService { +public class CrmFileService { @Autowired private CrmFileFeign crmFileFeign; - + @Autowired + private FileUploadComponent fileUploadComponent; public ResultBean> getPcAppendix(CommonAppendixSelectQuery query) { + ResultBean rb = ResultBean.fireFail(); + List data = crmFileFeign.getPcAppendix(query).getData(); + if (!data.isEmpty()) { + for (CommonAppendixVo datum : data) { + datum.setFilePath(fileUploadComponent.getUrlPrefix() + datum.getFilePath()); + } + } return crmFileFeign.getPcAppendix(query); } } diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java index af90c80..fa2287c 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java @@ -28,13 +28,16 @@ package com.yxt.oms.biz.func.smssalesbill; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; 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.purchaseappendix.PurchaseAppendixUrl; import com.yxt.oms.feign.sales.smssalesbill.SmsSalesBillFeign; import com.yxt.oms.feign.warehouse.warehouseInventory.WarehouseInventoryFeign; +import com.yxt.oms.utils.FileQueryUrl; import io.swagger.annotations.ApiModelProperty; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -65,6 +68,9 @@ public class SmsSalesBillService extends MybatisBaseService createQueryWrapper(SmsSalesBillQuery query) { // todo: 这里根据具体业务调整查询条件 // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); @@ -82,6 +88,28 @@ public class SmsSalesBillService extends MybatisBaseService goodsList = dto.getGoodsList(); + if (!goodsList.isEmpty() && goodsList.size() > 0) { + for (SmsSalesBillDetailDetailsVo smsSalesBillDetailDetailsVo : goodsList) { + List pic = smsSalesBillDetailDetailsVo.getPic(); + List pic2 = new ArrayList<>(); + if (!pic.isEmpty() && pic.size() > 0) { + for (String appendixUrl : pic) { + appendixUrl = appendixUrl.replace(fileUploadComponent.getUrlPrefix(), ""); + pic2.add(appendixUrl); + } + smsSalesBillDetailDetailsVo.setPic(pic2); + } + } + } + List files = dto.getFiles(); + if (!files.isEmpty() && files.size() > 0) { + for (FileQueryUrl appendixUrl : files) { + String filePath = appendixUrl.getUrl().replace(fileUploadComponent.getUrlPrefix(), ""); + appendixUrl.setUrl(filePath); + } + } + return smsSalesBillFeign.save(dto); } @@ -102,7 +130,29 @@ public class SmsSalesBillService extends MybatisBaseService fetchDetailsVoBySid(String sid) { - return smsSalesBillFeign.fetchDetailsBySid(sid); + ResultBean rb = ResultBean.fireFail(); + SmsSalesBillDetailsVo vo = smsSalesBillFeign.fetchDetailsBySid(sid).getData(); + List goods = vo.getGoodsList(); + if (!goods.isEmpty()) { + for (SmsSalesBillDetailDetailsVo detail : goods) { + List pic = detail.getPic(); + List picList = new ArrayList<>(); + if (!pic.isEmpty() && pic.size() > 0) { + for (String s : pic) { + picList.add(fileUploadComponent.getUrlPrefix() + s); + } + detail.setPic(picList); + } + } + } + List appendixList = vo.getFiles(); + if (!appendixList.isEmpty()) { + for (FileQueryUrl aseAppendixUrl : appendixList) { + String url = fileUploadComponent.getUrlPrefix() + aseAppendixUrl.getUrl(); + aseAppendixUrl.setUrl(url); + } + } + return rb.success().setData(vo); } public ResultBean> listPage(PagerQuery pq) { @@ -118,7 +168,7 @@ public class SmsSalesBillService extends MybatisBaseService reviewDetails(String sid) { - ResultBean rb = ResultBean.fireFail(); + ResultBean rb = ResultBean.fireFail(); ReviewDetailsVo data = smsSalesBillFeign.reviewDetails(sid).getData(); List goods = data.getGoods(); if (!goods.isEmpty()) {