From 57dfd150adf0db05ebaedd06f27f8f5c47a64813 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Thu, 17 Nov 2022 17:24:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E8=BD=A6=E7=A1=AE=E8=AE=A4=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/bushandover/BusHandoverMapper.xml     |  4 +-
 .../biz/bushandover/BusHandoverService.java   | 38 +++++++++++--------
 .../src/main/resources/ftl/entrust.ftl        | 12 +++---
 .../DeliveryConfirmService.java               |  3 ++
 4 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverMapper.xml
index f5764f3bc7..2a09ca071e 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverMapper.xml
@@ -33,11 +33,11 @@
      </select>-->
 
     <select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.bushandover.BusHandoverVo">
-        select bh.contractNo,
+        select distinct bh.sid,
+               bh.contractNo,
                bh.customerName,
                bh.handoverStateValue,
                bhi.modelName,
-               bh.sid,
                (select count(*) from bus_handover_items bhi2 where bhi2.handoverSid = bh.sid) as number,
                bh.handoverStateKey,
                bh.recipient
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java
index 5905e4a339..32034e094e 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java
@@ -41,7 +41,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.tomcat.util.threads.ThreadPoolExecutor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.io.File;
 import java.io.InputStream;
@@ -93,7 +92,7 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
     @Autowired
     private BaseVehicleFeign baseVehicleFeign;
 
-    @Transactional(rollbackFor = Exception.class)
+//    @Transactional(rollbackFor = Exception.class)
     public ResultBean<List<BusHandoverListVo>> saveDeliverybill(BusHandoverDto dto) {
         ResultBean<List<BusHandoverListVo>> rb = ResultBean.fireFail();
         //ToDo:验证是否包含已存在的车辆
@@ -498,28 +497,37 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
                 List<DownloadVo> stringList = new ArrayList<>();
                 DownloadVo vo = new DownloadVo();
                 BuscenterFile buscenterFile = buscenterFileService.selectByLinkSidOne(record.getSid(), BuscenterFileEnum.RECEIVE_CAR.getAttachType());
-                vo.setName(buscenterFile.getFileName());
-                vo.setDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + buscenterFile.getFilePath());
-                stringList.add(vo);
+                if(buscenterFile != null){
+                    vo.setName(buscenterFile.getFileName());
+                    vo.setDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + buscenterFile.getFilePath());
+                    stringList.add(vo);
+                }
+
                 vo = new DownloadVo();
                 buscenterFile = buscenterFileService.selectByLinkSidOne(record.getSid(), BuscenterFileEnum.ENTRUST_CONFIRM.getAttachType());
-                vo.setName(buscenterFile.getFileName());
-                vo.setDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + buscenterFile.getFilePath());
-                stringList.add(vo);
-                if (!record.getCustomerName().equals(record.getRecipient())) {
-                    vo = new DownloadVo();
-                    buscenterFile = buscenterFileService.selectByLinkSidOne(record.getSid(), BuscenterFileEnum.ENTRUST.getAttachType());
+                if(buscenterFile != null){
                     vo.setName(buscenterFile.getFileName());
                     vo.setDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + buscenterFile.getFilePath());
                     stringList.add(vo);
                 }
 
+                if (!record.getCustomerName().equals(record.getRecipient())) {
+                    vo = new DownloadVo();
+                    buscenterFile = buscenterFileService.selectByLinkSidOne(record.getSid(), BuscenterFileEnum.ENTRUST.getAttachType());
+                    if(buscenterFile != null){
+                        vo.setName(buscenterFile.getFileName());
+                        vo.setDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + buscenterFile.getFilePath());
+                        stringList.add(vo);
+                    }
+                }
+
                 vo = new DownloadVo();
                 buscenterFile = buscenterFileService.selectByLinkSidOne(record.getSid(), BuscenterFileEnum.EXIT_TICKET.getAttachType());
-                vo.setName(buscenterFile.getFileName());
-                vo.setDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + buscenterFile.getFilePath());
-                stringList.add(vo);
-
+                if(buscenterFile != null){
+                    vo.setName(buscenterFile.getFileName());
+                    vo.setDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + buscenterFile.getFilePath());
+                    stringList.add(vo);
+                }
                 record.setFileResps(stringList);
 
             }
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/entrust.ftl b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/entrust.ftl
index 54e4e2eaf2..80a0de8059 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/entrust.ftl
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/entrust.ftl
@@ -988,7 +988,7 @@
                         <w:sz w:val="28"/>
                         <w:sz-cs w:val="28"/>
                     </w:rPr>
-                    <w:t>           年</w:t>
+                    <w:t>       年</w:t>
                 </w:r>
                 <w:r>
                     <w:rPr>
@@ -1007,7 +1007,7 @@
                         <w:sz w:val="28"/>
                         <w:sz-cs w:val="28"/>
                     </w:rPr>
-                    <w:t>           月</w:t>
+                    <w:t>       月</w:t>
                 </w:r>
                 <w:r>
                     <w:rPr>
@@ -1026,7 +1026,7 @@
                         <w:sz w:val="28"/>
                         <w:sz-cs w:val="28"/>
                     </w:rPr>
-                    <w:t>           日至</w:t>
+                    <w:t>       日至</w:t>
                 </w:r>
                 <w:r>
                     <w:rPr>
@@ -1045,7 +1045,7 @@
                         <w:sz w:val="28"/>
                         <w:sz-cs w:val="28"/>
                     </w:rPr>
-                    <w:t>           年</w:t>
+                    <w:t>       年</w:t>
                 </w:r>
                 <w:r>
                     <w:rPr>
@@ -1064,7 +1064,7 @@
                         <w:sz w:val="28"/>
                         <w:sz-cs w:val="28"/>
                     </w:rPr>
-                    <w:t>           月</w:t>
+                    <w:t>       月</w:t>
                 </w:r>
                 <w:r>
                     <w:rPr>
@@ -1083,7 +1083,7 @@
                         <w:sz w:val="28"/>
                         <w:sz-cs w:val="28"/>
                     </w:rPr>
-                    <w:t>           日</w:t>
+                    <w:t>       日</w:t>
                 </w:r>
             </w:p>
             <w:sectPr wsp:rsidR="00166AB3">
diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/deliveryConfirm/DeliveryConfirmService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/deliveryConfirm/DeliveryConfirmService.java
index cd182ebc50..20ca7071fc 100644
--- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/deliveryConfirm/DeliveryConfirmService.java
+++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/deliveryConfirm/DeliveryConfirmService.java
@@ -68,6 +68,9 @@ public class DeliveryConfirmService {
         BusHandoverDto busHandoverDto = new BusHandoverDto();
         BeanUtil.copyProperties(dto, busHandoverDto);
         ResultBean<List<BusHandoverListVo>> resultBean = busHandoverFeign.saveDeliverybill(busHandoverDto);
+        if(!resultBean.getSuccess()){
+            return rb.setMsg(resultBean.getMsg());
+        }
         List<DeliveryBillListVo> list = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), DeliveryBillListVo.class)).collect(Collectors.toList());
         return rb.success().setData(list);
     }