From b0ca97eff71cb98ec7371ccd674676bc3699d2d9 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Tue, 16 May 2023 17:08:56 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=BC=80=E7=A5=A8=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E9=9B=86=E5=90=88=E9=9D=9E=E7=A9=BA=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java
index 82ad9b7e87..efa302bf70 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java
@@ -264,7 +264,7 @@ public class FinVehicleInvoiceService extends MybatisBaseService<FinVehicleInvoi
     public int myUpdateBySid(FinVehicleInvoiceDto dto, String sid) {
         StringBuilder sb = new StringBuilder();
         String urlPrefix = fileUploadComponent.getUrlPrefix();
-        if (null != dto.getFilePaths()) {
+        if (null != dto.getFilePaths() && dto.getFilePaths().isEmpty()) {
             for (String filePath : dto.getFilePaths()) {
                 String path = filePath.substring(urlPrefix.length());
                 sb.append(path).append(",");
@@ -295,7 +295,7 @@ public class FinVehicleInvoiceService extends MybatisBaseService<FinVehicleInvoi
         finVehicleInvoice.setSid(sidAdd);
         StringBuilder sb = new StringBuilder();
         String urlPrefix = fileUploadComponent.getUrlPrefix();
-        if (null != dto.getFilePaths()) {
+        if (null != dto.getFilePaths() && dto.getFilePaths().isEmpty()) {
             for (String filePath : dto.getFilePaths()) {
                 String path = filePath.substring(urlPrefix.length());
                 sb.append(path).append(",");

From bec5e40eb9d05315b28a4201fe0ae3f585580731 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Tue, 16 May 2023 17:16:40 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=85=88=E6=B3=A8=E9=87=8A=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E6=AC=A0=E6=AC=BE=E6=8F=90=E8=BD=A6=E9=99=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusArrearsCarryVehicleApplyService.java   | 23 +++++++++++--------
 .../loansolutions/LoanSolutionsService.java   |  2 --
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java
index e280d38937..d0bb931dda 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java
@@ -762,29 +762,32 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
         //车架号发生变化，重新生成新车买卖合同（欠款）、欠款提车担保承诺书、总经理担保承诺书、
         //回购日期发生变化，重新生成欠款提车担保承诺书
         if (StringUtils.isBlank(sid)) {
-            //生成新车买卖合同（欠款）
+         /*   //生成新车买卖合同（欠款）
             carContractDownloadUrl = carContractDownloadUrl(dto, map);
+            //生成欠款提车担保承诺书
+            guaranteeLetterDownloadUrl = guaranteeLetterDownloadUrl(dto, map);
+            //生成总经理担保书
+            zjlLetterDownloadUrl = zjlLetterDownloadUrl(dto, map);
+            //生成股东会对外担保决议
+            gdLetterDownloadUrl = gdLetterDownloadUrl();*/
             PdfVo pdfVo = new PdfVo();
             pdfVo.setType(BuscenterFileEnum.CARCONTRACT_DOWNLOADURL.getAttachType());
             pdfVo.setName(BuscenterFileEnum.CARCONTRACT_DOWNLOADURL.getMark());
             pdfVo.setDownUrl(carContractDownloadUrl);
             list.add(pdfVo);
-            //生成股东会对外担保决议
-            gdLetterDownloadUrl = gdLetterDownloadUrl();
+
             pdfVo = new PdfVo();
             pdfVo.setType(BuscenterFileEnum.GDLETTER_DOWNLOADURL.getAttachType());
             pdfVo.setName(BuscenterFileEnum.GDLETTER_DOWNLOADURL.getMark());
             pdfVo.setDownUrl(gdLetterDownloadUrl);
             list.add(pdfVo);
-            //生成总经理担保书
-            zjlLetterDownloadUrl = zjlLetterDownloadUrl(dto, map);
+
             pdfVo = new PdfVo();
             pdfVo.setType(BuscenterFileEnum.ZJLLETTER_DOWNLOADURL.getAttachType());
             pdfVo.setName(BuscenterFileEnum.ZJLLETTER_DOWNLOADURL.getMark());
             pdfVo.setDownUrl(zjlLetterDownloadUrl);
             list.add(pdfVo);
-            //生成欠款提车担保承诺书
-            guaranteeLetterDownloadUrl = guaranteeLetterDownloadUrl(dto, map);
+
             pdfVo = new PdfVo();
             pdfVo.setType(BuscenterFileEnum.GUARANTEELETTER_DOWNLOADURL.getAttachType());
             pdfVo.setName(BuscenterFileEnum.GUARANTEELETTER_DOWNLOADURL.getMark());
@@ -825,13 +828,13 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
             }
             if (isChange) {
                 //生成新车买卖合同（欠款）
-                carContractDownloadUrl = carContractDownloadUrl(dto, map);
+//                carContractDownloadUrl = carContractDownloadUrl(dto, map);
                 //生成总经理担保书
-                zjlLetterDownloadUrl = zjlLetterDownloadUrl(dto, map);
+//                zjlLetterDownloadUrl = zjlLetterDownloadUrl(dto, map);
             }
             if (dateChange || isChange) {
                 //生成欠款提车担保承诺书
-                guaranteeLetterDownloadUrl = guaranteeLetterDownloadUrl(dto, map);
+//                guaranteeLetterDownloadUrl = guaranteeLetterDownloadUrl(dto, map);
             }
             //新车买卖合同（欠款）
             PdfVo pdfVo = new PdfVo();
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java
index 6a19599d90..0d3df3d7bb 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java
@@ -86,8 +86,6 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 solutionsDetailsVo.setGcPrice(appOrderPriceInfoVo.getGcPrice());
                 solutionsDetailsVo.setSzPrice(appOrderPriceInfoVo.getSzPrice());
             }
-
-
         }
         if (loanSolutions == null) {
             return rb.success().setData(solutionsDetailsVo).setCode("20000");

From e26b02aa82f0ae092266a3ba9ad745a06f877638 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Tue, 16 May 2023 17:20:11 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=BC=80=E7=A5=A8=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E9=9B=86=E5=90=88=E9=9D=9E=E7=A9=BA=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java
index efa302bf70..8ebadc524d 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java
@@ -264,7 +264,7 @@ public class FinVehicleInvoiceService extends MybatisBaseService<FinVehicleInvoi
     public int myUpdateBySid(FinVehicleInvoiceDto dto, String sid) {
         StringBuilder sb = new StringBuilder();
         String urlPrefix = fileUploadComponent.getUrlPrefix();
-        if (null != dto.getFilePaths() && dto.getFilePaths().isEmpty()) {
+        if (null != dto.getFilePaths() && !dto.getFilePaths().isEmpty()) {
             for (String filePath : dto.getFilePaths()) {
                 String path = filePath.substring(urlPrefix.length());
                 sb.append(path).append(",");
@@ -295,7 +295,7 @@ public class FinVehicleInvoiceService extends MybatisBaseService<FinVehicleInvoi
         finVehicleInvoice.setSid(sidAdd);
         StringBuilder sb = new StringBuilder();
         String urlPrefix = fileUploadComponent.getUrlPrefix();
-        if (null != dto.getFilePaths() && dto.getFilePaths().isEmpty()) {
+        if (null != dto.getFilePaths() && !dto.getFilePaths().isEmpty()) {
             for (String filePath : dto.getFilePaths()) {
                 String path = filePath.substring(urlPrefix.length());
                 sb.append(path).append(",");