From 12ba0e4ca41c003ce656a430374a31cae1a6b220 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Mon, 10 Apr 2023 15:05:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=BC=80=E7=A5=A8=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E4=BF=AE=E6=94=B9=E4=BF=9D=E5=AD=98=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FinVehicleInvoiceRest.java                | 44 +---------------
 .../FinVehicleInvoiceService.java             | 52 +++++++++++++++++++
 2 files changed, 54 insertions(+), 42 deletions(-)

diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java
index a0f9043ce5..f724b0942b 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java
@@ -106,49 +106,9 @@ public class FinVehicleInvoiceRest implements FinVehicleInvoiceFeign {
         ResultBean rb = ResultBean.fireFail();
         String sid = dto.getSid();
         if (StringUtils.isNotEmpty(sid)) {
-            StringBuilder sb = new StringBuilder();
-            String urlPrefix = fileUploadComponent.getUrlPrefix();
-            if (null != dto.getFilePaths()) {
-                for (String filePath : dto.getFilePaths()) {
-                    String[] split = filePath.split(urlPrefix);
-                    String s = split[1];
-                    sb.append(s).append(",");
-                }
-                sb.delete(sb.length() - 1, sb.length());
-                dto.setFilePath(sb.toString());
-            }
-            if (StringUtils.isNotBlank(dto.getFilePath())) {
-                dto.setBillingStateKey("002");
-                dto.setBillingState("已开票");
-            }
-            if (StringUtils.isNotEmpty(dto.getVinNo())) {
-                String VIN = dto.getVinNo();
-                dto.setVIN(VIN);
-            }
-            finVehicleInvoiceService.updateBySid(dto, sid);
+            finVehicleInvoiceService.myUpdateBySid(dto, sid);
         } else {
-            FinVehicleInvoice finVehicleInvoice = new FinVehicleInvoice();
-            String sidAdd = finVehicleInvoice.getSid();
-            BeanUtil.copyProperties(dto, finVehicleInvoice);
-            finVehicleInvoice.setSid(sidAdd);
-            StringBuilder sb = new StringBuilder();
-            String urlPrefix = fileUploadComponent.getUrlPrefix();
-            if (null != dto.getFilePaths()) {
-                for (String filePath : dto.getFilePaths()) {
-                    String[] split = filePath.split(urlPrefix);
-                    String s = split[1];
-                    sb.append(s).append(",");
-                }
-                sb.delete(sb.length() - 1, sb.length());
-                finVehicleInvoice.setFilePath(sb.toString());
-                finVehicleInvoice.setBillingStateKey("002");
-                finVehicleInvoice.setBillingState("已开票");
-            }
-            if (StringUtils.isNotEmpty(dto.getVinNo())) {
-                String VIN = dto.getVinNo();
-                finVehicleInvoice.setVIN(VIN);
-            }
-            finVehicleInvoiceService.save(finVehicleInvoice);
+            finVehicleInvoiceService.mySave(dto);
         }
         return rb.success();
     }
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 7196cf9984..54991d7cc1 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
@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.fin.api.finvehicleinvoice.*;
+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;
@@ -11,6 +12,7 @@ import com.yxt.common.core.vo.PagerVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -28,6 +30,9 @@ import java.util.List;
  */
 @Service
 public class FinVehicleInvoiceService extends MybatisBaseService<FinVehicleInvoiceMapper, FinVehicleInvoice> {
+    @Resource
+    private FileUploadComponent fileUploadComponent;
+
     public PagerVo<FinVehicleInvoice> listPage(PagerQuery<FinVehicleInvoiceQuery> pq) {
         FinVehicleInvoiceQuery query = pq.getParams();
         QueryWrapper<FinVehicleInvoice> qw = createQueryWrapper(query);
@@ -183,4 +188,51 @@ public class FinVehicleInvoiceService extends MybatisBaseService<FinVehicleInvoi
         return vo;
     }
 
+    public int myUpdateBySid(FinVehicleInvoiceDto dto, String sid) {
+        StringBuilder sb = new StringBuilder();
+        String urlPrefix = fileUploadComponent.getUrlPrefix();
+        if (null != dto.getFilePaths()) {
+            for (String filePath : dto.getFilePaths()) {
+                String[] split = filePath.split(urlPrefix);
+                String s = split[1];
+                sb.append(s).append(",");
+            }
+            sb.delete(sb.length() - 1, sb.length());
+            dto.setFilePath(sb.toString());
+        }
+        if (com.yxt.common.base.utils.StringUtils.isNotBlank(dto.getFilePath())) {
+            dto.setBillingStateKey("002");
+            dto.setBillingState("已开票");
+        }
+        if (com.yxt.common.base.utils.StringUtils.isNotEmpty(dto.getVinNo())) {
+            String VIN = dto.getVinNo();
+            dto.setVIN(VIN);
+        }
+        return updateBySid(dto,sid);
+    }
+
+    public boolean mySave(FinVehicleInvoiceDto dto) {
+        FinVehicleInvoice finVehicleInvoice = new FinVehicleInvoice();
+        String sidAdd = finVehicleInvoice.getSid();
+        BeanUtil.copyProperties(dto, finVehicleInvoice);
+        finVehicleInvoice.setSid(sidAdd);
+        StringBuilder sb = new StringBuilder();
+        String urlPrefix = fileUploadComponent.getUrlPrefix();
+        if (null != dto.getFilePaths()) {
+            for (String filePath : dto.getFilePaths()) {
+                String[] split = filePath.split(urlPrefix);
+                String s = split[1];
+                sb.append(s).append(",");
+            }
+            sb.delete(sb.length() - 1, sb.length());
+            finVehicleInvoice.setFilePath(sb.toString());
+            finVehicleInvoice.setBillingStateKey("002");
+            finVehicleInvoice.setBillingState("已开票");
+        }
+        if (com.yxt.common.base.utils.StringUtils.isNotEmpty(dto.getVinNo())) {
+            String VIN = dto.getVinNo();
+            finVehicleInvoice.setVIN(VIN);
+        }
+        return save(finVehicleInvoice);
+    }
 }
\ No newline at end of file