diff --git a/yudao-module-visit/src/main/java/cn/iocoder/yudao/module/visit/service/info/InfoServiceImpl.java b/yudao-module-visit/src/main/java/cn/iocoder/yudao/module/visit/service/info/InfoServiceImpl.java index 06295a2e9eb77267513cfa5c8a2138f4bd51ab54..b161063c976ea3b17ba898202077b0c8b2805c30 100644 --- a/yudao-module-visit/src/main/java/cn/iocoder/yudao/module/visit/service/info/InfoServiceImpl.java +++ b/yudao-module-visit/src/main/java/cn/iocoder/yudao/module/visit/service/info/InfoServiceImpl.java @@ -176,8 +176,6 @@ public class InfoServiceImpl implements InfoService { //拜访时间记录 List visitDateList = new ArrayList<>(); //以第一个公司名称作为合并打印的公司 - String companyName = info.get(0).getCompanyName(); - Long companyId = info.get(0).getCompanyId(); //取最多4张服务图片 int maxImages = 4; for (InfoDO infoDO : info) { @@ -199,14 +197,14 @@ public class InfoServiceImpl implements InfoService { }); //下面获取客户信息 InfoPrintVO infoPrintVO = new InfoPrintVO(); - CustomerInfoDO customerInfoDO = customerInfoMapper.selectByCompanyName(companyName,companyId); - if (customerInfoDO != null){ - infoPrintVO.setVisitProductNames(customerInfoDO.getProductNames());//本次拜访品种 - infoPrintVO.setCompanyName(customerInfoDO.getCompanyName());//公司名称 - infoPrintVO.setSalesman(customerInfoDO.getCreator());//拜访记录的创建者就是该记录的业务员 - infoPrintVO.setLocationImage(customerInfoDO.getLocationImage());//公司定位图 - infoPrintVO.setContact(customerInfoDO.getContact()); - infoPrintVO.setDepartment(customerInfoDO.getDepartment()); + InfoDO infoDO = info.get(0); + if (infoDO != null){ + infoPrintVO.setVisitProductNames(infoDO.getVisitProductNames());//本次拜访品种 + infoPrintVO.setCompanyName(infoDO.getCompanyName());//公司名称 + infoPrintVO.setSalesman(infoDO.getCreator());//拜访记录的创建者就是该记录的业务员 + infoPrintVO.setLocationImage(infoDO.getLocationImage());//公司定位图 + infoPrintVO.setContact(infoDO.getContact()); + infoPrintVO.setDepartment(infoDO.getDepartment()); } //添加多次的信息 infoPrintVO.setServiceContent(serviceContent); diff --git a/yudao-ui/yudao-ui-admin-vue3/.env b/yudao-ui/yudao-ui-admin-vue3/.env index 2e296821a3902e190e7852d55a48530b854b9791..6019fbdca07fcb72602b68809850a1797c55c8e7 100644 --- a/yudao-ui/yudao-ui-admin-vue3/.env +++ b/yudao-ui/yudao-ui-admin-vue3/.env @@ -1,5 +1,5 @@ # 标题 -VITE_APP_TITLE=唐桥业务拜访平台 +VITE_APP_TITLE=千程拜访管理平台 # 项目本地运行端口号 VITE_PORT=80 diff --git a/yudao-ui/yudao-ui-admin-vue3/index.html b/yudao-ui/yudao-ui-admin-vue3/index.html index 622396a9d7ec1d06ccba44a796d7a25f42badc51..37e313ec0800db95c73dcc1c4d298d4dd6f44ba8 100644 --- a/yudao-ui/yudao-ui-admin-vue3/index.html +++ b/yudao-ui/yudao-ui-admin-vue3/index.html @@ -7,11 +7,11 @@ %VITE_APP_TITLE%