From 8ac6000605ddf15c058ceda4d188a25587d3cb1f Mon Sep 17 00:00:00 2001
From: hjc <459774188@qq.com>
Date: Sat, 23 Nov 2019 18:11:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BssVatInvoiceController.java   | 27 ++++++++------
 admin/src/main/resources/static/js/main.js    | 37 +++++++++----------
 .../templates/business/vatInvoice/detail.html |  4 +-
 3 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/admin/src/main/java/com/cwhelp/admin/business/controller/BssVatInvoiceController.java b/admin/src/main/java/com/cwhelp/admin/business/controller/BssVatInvoiceController.java
index 9da8edc..48f44ba 100644
--- a/admin/src/main/java/com/cwhelp/admin/business/controller/BssVatInvoiceController.java
+++ b/admin/src/main/java/com/cwhelp/admin/business/controller/BssVatInvoiceController.java
@@ -124,19 +124,22 @@ public class BssVatInvoiceController {
         if (bssVatInvoice.getId() != null) {
             BssVatInvoice beBssVatInvoice = bssVatInvoiceService.getById(bssVatInvoice.getId());
             EntityBeanUtil.copyProperties(beBssVatInvoice, bssVatInvoice);
+            bssVatInvoice.setSalerTaxInfo(beBssVatInvoice.getSalerTaxInfo());
+            bssVatInvoice.setBuyTaxInfo(beBssVatInvoice.getBuyTaxInfo());
+        }else {
+            if(!StringUtil.isBlank(String.valueOf(bssVatInvoice.getSalerTaxInfoId()))){
+                bssVatInvoice.setSalerTaxInfo(bssTaxinfoService.getById(bssVatInvoice.getSalerTaxInfoId()));
+            }
+            if(!StringUtil.isBlank(String.valueOf(bssVatInvoice.getBuyTaxInfoId()))) {
+                bssVatInvoice.setBuyTaxInfo(bssTaxinfoService.getById(bssVatInvoice.getBuyTaxInfoId()));
+            }
+            List<BssGoods> bssGoods = bssVatInvoice.getBssGoods();
+            if(bssGoods != null && bssGoods.size() > 0){
+                bssGoods.stream().forEach(good ->{
+                    good.setVatInvoice(bssVatInvoice);
+                });
+            }
         }
-        if(!StringUtil.isBlank(String.valueOf(bssVatInvoice.getSalerTaxInfoId()))){
-            bssVatInvoice.setSalerTaxInfo(bssTaxinfoService.getById(bssVatInvoice.getSalerTaxInfoId()));
-        }
-        if(!StringUtil.isBlank(String.valueOf(bssVatInvoice.getBuyTaxInfoId()))) {
-            bssVatInvoice.setBuyTaxInfo(bssTaxinfoService.getById(bssVatInvoice.getBuyTaxInfoId()));
-        }
-
-        List<BssGoods> bssGoods = bssVatInvoice.getBssGoods();
-        bssGoods.stream().forEach(good ->{
-            good.setVatInvoice(bssVatInvoice);
-        });
-
         // 保存数据
         bssVatInvoiceService.save(bssVatInvoice);
         return ResultVoUtil.SAVE_SUCCESS;
diff --git a/admin/src/main/resources/static/js/main.js b/admin/src/main/resources/static/js/main.js
index 2b1f636..2a36d1f 100644
--- a/admin/src/main/resources/static/js/main.js
+++ b/admin/src/main/resources/static/js/main.js
@@ -135,24 +135,23 @@ layui.use(['element', 'form', 'layer', 'upload'], function () {
         var serializeArray = form.serializeArray();
         var _newData = null;
         var from = false;   // from = true 代表增值税页面请求，用设置content-type的请求
-        for(var i=0; i<serializeArray.length; i++){
-            if(serializeArray[i].name == 'salerTaxInfoId'){
-                from = true;
-                _newData = trans.serialize( serializeArray );
-                var goods = createGoodsParams();
-                _newData.bssGoods = goods;
-                delete _newData.name;
-                delete _newData.specification;
-                delete _newData.unit;
-                delete _newData.num;
-                delete _newData.unitPrice;
-                delete _newData.detailAmount;
-                delete _newData.taxRate;
-                delete _newData.goodTaxAmount;
-                break;
-            }else {
-                continue;
-            }
+        console.info("本次请求的url是---", url);
+        if(url == '/bss/vatInvoice/add'){//增值税add页面请求
+            from = true;
+            _newData = trans.serialize( serializeArray );
+            var goods = createGoodsParams();
+            _newData.bssGoods = goods;
+            delete _newData.name;
+            delete _newData.specification;
+            delete _newData.unit;
+            delete _newData.num;
+            delete _newData.unitPrice;
+            delete _newData.detailAmount;
+            delete _newData.taxRate;
+            delete _newData.goodTaxAmount;
+        }else if(url == '/bss/vatInvoice/edit'){//增值税edit页面请求
+            from = true;
+            _newData = trans.serialize( serializeArray );
         }
 
         if(from){
@@ -169,7 +168,7 @@ layui.use(['element', 'form', 'layer', 'upload'], function () {
                 }
             });
         }else {
-            $.post(url, _newData, function(result) {
+            $.post(url, serializeArray, function(result) {
                 if (result.data == null) {
                     result.data = 'submit[refresh]';
                 }
diff --git a/admin/src/main/resources/templates/business/vatInvoice/detail.html b/admin/src/main/resources/templates/business/vatInvoice/detail.html
index c99d1a1..1dd8c2c 100644
--- a/admin/src/main/resources/templates/business/vatInvoice/detail.html
+++ b/admin/src/main/resources/templates/business/vatInvoice/detail.html
@@ -46,9 +46,9 @@
                 </tr>
                 <tr>
                     <th>购买方纳税人信息</th>
-                    <td th:text="${bssVatInvoice.buyTaxInfo.name}"></td>
+                    <td th:text="${bssVatInvoice.buyTaxInfo?.name}"></td>
                     <th>销售方纳税人信息</th>
-                    <td th:text="${bssVatInvoice.salerTaxInfo.name}"></td>
+                    <td th:text="${bssVatInvoice.salerTaxInfo?.name}"></td>
                 </tr>
                 <tr>
                     <th>创建时间</th>