From f3465a9b153074f10f92b57ff6d0181d60f8ef89 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Fri, 31 May 2024 10:09:26 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E8=B7=9F=E8=BF=9B?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=EF=BC=88?= =?UTF-8?q?=E6=9A=82=E6=9C=AA=E4=BD=BF=E7=94=A8=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/kehuguanli/kehugenjinjilu/genjinjiluguanli.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehugenjinjilu/genjinjiluguanli.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehugenjinjilu/genjinjiluguanli.vue index d53df1a924..95ed9b3c7e 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehugenjinjilu/genjinjiluguanli.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehugenjinjilu/genjinjiluguanli.vue @@ -114,7 +114,7 @@ - + @@ -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() { From c30f342b51b786eba1cdf06d8790536d988dc936 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Fri, 31 May 2024 14:28:55 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=87=91=E8=9E=8D?= =?UTF-8?q?=E6=96=B9=E6=A1=88--=E6=B5=81=E7=A8=8B=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E6=97=B6=E6=8C=82=E8=BD=A6=E4=BB=B7=E6=A0=BC=E4=B8=8D=E5=8F=AF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/workflow/publicPage/financialscheme.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 @@
*主车发票价元 配件元 - 挂车元 + 挂车元 保险元 购置税元
From c914a217fb3419bfe09840f66d4afce2eb233dbb Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Fri, 31 May 2024 14:29:51 +0800 Subject: [PATCH 3/4] =?UTF-8?q?PC=E8=AF=A6=E6=83=85=E9=87=91=E8=9E=8D?= =?UTF-8?q?=E6=B5=8B=E7=AE=97=E8=BF=94=E5=9B=9E=E6=8C=82=E8=BD=A6=E9=87=91?= =?UTF-8?q?=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../buscenter/biz/bussalesorder/BusSalesOrderService.java | 5 +++++ 1 file changed, 5 insertions(+) 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..f6a6441c65 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 @@ -867,6 +867,11 @@ public class BusSalesOrderService extends MybatisBaseService Date: Fri, 31 May 2024 16:39:24 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bussalesorder/BusSalesOrderService.java | 120 ++++++++++-------- 1 file changed, 66 insertions(+), 54 deletions(-) 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 f6a6441c65..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); }