diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 345f3c55f9..ab44469837 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -485,73 +485,85 @@ public class BusSalesOrderService extends MybatisBaseService certFiless = new ArrayList<>(); - for (String path : certFiles) { - String url = fileUploadComponent.getUrlPrefix() + path; - BusSalesOrderTrailerFile busSalesOrderTrailerFile = new BusSalesOrderTrailerFile(); - busSalesOrderTrailerFile.setUrl(url); - certFiless.add(busSalesOrderTrailerFile); - } - busSalesOrderTrailerDetailsVo.setCertFile(certFiless); + if (StringUtils.isNotBlank(certFile)){ + String[] certFiles = certFile.split(","); + List certFiless = new ArrayList<>(); + for (String path : certFiles) { + String url = fileUploadComponent.getUrlPrefix() + path; + BusSalesOrderTrailerFile busSalesOrderTrailerFile = new BusSalesOrderTrailerFile(); + busSalesOrderTrailerFile.setUrl(url); + certFiless.add(busSalesOrderTrailerFile); + } + busSalesOrderTrailerDetailsVo.setCertFile(certFiless); + } String contractFile = busSalesOrderTrailer.getContractFile(); - String[] contractFiles = contractFile.split(","); - List contractFiless = new ArrayList<>(); - for (String path : contractFiles) { - String url = fileUploadComponent.getUrlPrefix() + path; - BusSalesOrderTrailerFile busSalesOrderTrailerFile = new BusSalesOrderTrailerFile(); - busSalesOrderTrailerFile.setUrl(url); - contractFiless.add(busSalesOrderTrailerFile); - } - busSalesOrderTrailerDetailsVo.setContractFile(contractFiless); + if (StringUtils.isNotBlank(contractFile)){ + String[] contractFiles = contractFile.split(","); + List contractFiless = new ArrayList<>(); + for (String path : contractFiles) { + String url = fileUploadComponent.getUrlPrefix() + path; + BusSalesOrderTrailerFile busSalesOrderTrailerFile = new BusSalesOrderTrailerFile(); + busSalesOrderTrailerFile.setUrl(url); + contractFiless.add(busSalesOrderTrailerFile); + } + busSalesOrderTrailerDetailsVo.setContractFile(contractFiless); + } vo.setGc1(busSalesOrderTrailerDetailsVo); }else if (busSalesOrderTrailerDetailsVos.size() == 2){ //挂车1 BusSalesOrderTrailerDetailsVo gc1 = busSalesOrderTrailerDetailsVos.get(0); BusSalesOrderTrailer gcst1 = busSalesOrderTrailerService.fetchBySid(gc1.getSid()); String certFile1 = gcst1.getCertFile(); - String[] certFiles1 = certFile1.split(","); - List certFiless1 = new ArrayList<>(); - for (String path : certFiles1) { - String url = fileUploadComponent.getUrlPrefix() + path; - BusSalesOrderTrailerFile busSalesOrderTrailerFile = new BusSalesOrderTrailerFile(); - busSalesOrderTrailerFile.setUrl(url); - certFiless1.add(busSalesOrderTrailerFile); - } - gc1.setCertFile(certFiless1); + if (StringUtils.isNotBlank(certFile1)){ + String[] certFiles1 = certFile1.split(","); + List certFiless1 = new ArrayList<>(); + for (String path : certFiles1) { + String url = fileUploadComponent.getUrlPrefix() + path; + BusSalesOrderTrailerFile busSalesOrderTrailerFile = new BusSalesOrderTrailerFile(); + busSalesOrderTrailerFile.setUrl(url); + certFiless1.add(busSalesOrderTrailerFile); + } + gc1.setCertFile(certFiless1); + } String contractFile1 = gcst1.getContractFile(); - String[] contractFiles1 = contractFile1.split(","); - List contractFiless1 = new ArrayList<>(); - for (String path : contractFiles1) { - String url = fileUploadComponent.getUrlPrefix() + path; - BusSalesOrderTrailerFile busSalesOrderTrailerFile = new BusSalesOrderTrailerFile(); - busSalesOrderTrailerFile.setUrl(url); - contractFiless1.add(busSalesOrderTrailerFile); - } - gc1.setContractFile(contractFiless1); + if (StringUtils.isNotBlank(contractFile1)){ + String[] contractFiles1 = contractFile1.split(","); + List contractFiless1 = new ArrayList<>(); + for (String path : contractFiles1) { + String url = fileUploadComponent.getUrlPrefix() + path; + BusSalesOrderTrailerFile busSalesOrderTrailerFile = new BusSalesOrderTrailerFile(); + busSalesOrderTrailerFile.setUrl(url); + contractFiless1.add(busSalesOrderTrailerFile); + } + gc1.setContractFile(contractFiless1); + } //挂车2 BusSalesOrderTrailerDetailsVo gc2 = busSalesOrderTrailerDetailsVos.get(1); BusSalesOrderTrailer gcst2 = busSalesOrderTrailerService.fetchBySid(gc2.getSid()); String certFile2 = gcst2.getCertFile(); - String[] certFiles2 = certFile2.split(","); - List certFiless2 = new ArrayList<>(); - for (String path : certFiles2) { - String url = fileUploadComponent.getUrlPrefix() + path; - BusSalesOrderTrailerFile busSalesOrderTrailerFile = new BusSalesOrderTrailerFile(); - busSalesOrderTrailerFile.setUrl(url); - certFiless2.add(busSalesOrderTrailerFile); - } - gc2.setCertFile(certFiless2); + if (StringUtils.isNotBlank(certFile2)){ + String[] certFiles2 = certFile2.split(","); + List certFiless2 = new ArrayList<>(); + for (String path : certFiles2) { + String url = fileUploadComponent.getUrlPrefix() + path; + BusSalesOrderTrailerFile busSalesOrderTrailerFile = new BusSalesOrderTrailerFile(); + busSalesOrderTrailerFile.setUrl(url); + certFiless2.add(busSalesOrderTrailerFile); + } + gc2.setCertFile(certFiless2); + } String contractFile2 = gcst1.getContractFile(); - String[] contractFiles2 = contractFile2.split(","); - List contractFiless2 = new ArrayList<>(); - for (String path : contractFiles2) { - String url = fileUploadComponent.getUrlPrefix() + path; - BusSalesOrderTrailerFile busSalesOrderTrailerFile = new BusSalesOrderTrailerFile(); - busSalesOrderTrailerFile.setUrl(url); - contractFiless2.add(busSalesOrderTrailerFile); - } - gc2.setContractFile(contractFiless2); + if (StringUtils.isNotBlank(contractFile2)){ + String[] contractFiles2 = contractFile2.split(","); + List contractFiless2 = new ArrayList<>(); + for (String path : contractFiles2) { + String url = fileUploadComponent.getUrlPrefix() + path; + BusSalesOrderTrailerFile busSalesOrderTrailerFile = new BusSalesOrderTrailerFile(); + busSalesOrderTrailerFile.setUrl(url); + contractFiless2.add(busSalesOrderTrailerFile); + } + gc2.setContractFile(contractFiless2); + } vo.setGc1(gc1); vo.setGc2(gc2); } @@ -867,6 +879,11 @@ public class BusSalesOrderService extends MybatisBaseService - + @@ -127,7 +127,7 @@ import pageye from '@/components/pagination/pageye' import ButtonBar from '@/components/ButtonBar' import genjinjiluAdd from './genjinjiliAdd.vue' import {typeValues} from '@/api/dictcommons/shujuzidian' -import genjinjiluInfo from './genjinjiluinfo.vue' +// import genjinjiluInfo from './genjinjiluinfo.vue' import {loginDetails} from '@/api/dictcommons/basemanufacturer' import {getStorage} from '@/utils/auth' import {getPcAppendix} from '@/api/jichuxinxi/commonappendix' @@ -140,7 +140,7 @@ export default { pageye, ButtonBar, genjinjiluAdd, - genjinjiluInfo, + // genjinjiluInfo, cheliangxuqiu }, data() { diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/financialscheme.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/financialscheme.vue index 4bf791c3f5..c9791d0c2a 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/financialscheme.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/financialscheme.vue @@ -35,7 +35,7 @@
*主车发票价 配件 - 挂车 + 挂车 保险 购置税