From 311f8e6cd384bab29dd47ea24b9248d25ae78867 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Tue, 4 Jul 2023 16:13:43 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusHandoverPrepareVehicleService.java                | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleService.java
index 4af3781b6e..d63ed9c701 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleService.java
@@ -28,6 +28,7 @@ package com.yxt.anrui.buscenter.biz.bushandoverpreparevehicle;
 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.base.common.enums.CertificState;
 import com.yxt.anrui.buscenter.api.bushandoverprepare.BusHandoverPrepare;
 import com.yxt.anrui.buscenter.api.bushandoverprepare.HandoverInformationIntemVo;
 import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.*;
@@ -166,7 +167,13 @@ public class BusHandoverPrepareVehicleService extends MybatisBaseService<BusHand
                             vo.setOnBoardDataStateStr("接收确认");
                         }
                     }else{
-                        vo.setOnBoardDataState(true);
+                        if(CertificState.TransferState.TRANSTATE_YYJ.getCode().equals(busVehicleInformationHandover.getTransferStateKey())){
+                            vo.setOnBoardDataState(true);
+                        }else{
+                            vo.setOnBoardDataState(false);
+                            vo.setOnBoardDataStateStr("接收确认");
+                        }
+
                     }
                 }
             }

From 811a000675fd50927affc2fcd552fd7753cb1d81 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Tue, 4 Jul 2023 16:48:59 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml | 2 +-
 .../biz/bussalesorderdiscount/BusSalesOrderDiscountMapper.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml
index 7c4707aa22..1a7818d193 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml
@@ -133,7 +133,7 @@
     </select>
 
     <select id="selectNumByContractNo" resultType="int">
-        select sum(bddd.giveNum) from bus_delivered_details_discount bddd left join bus_delivered bd on bd.sid = bddd.applySid
+        select IFNULL(sum(bddd.giveNum),0) from bus_delivered_details_discount bddd left join bus_delivered bd on bd.sid = bddd.applySid
         where contractNo = #{contractId} and (bd.state =2 or bd.state = 3)
     </select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountMapper.xml
index 2866ce8cb8..5e399d6022 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountMapper.xml
@@ -72,7 +72,7 @@
     </select>
 
     <select id="selectByContractNo" resultType="int">
-        select sum(bddd.num) from bus_sales_order_discount bddd left join bus_sales_order bo on bo.sid = bddd.salesOrderSid
+        select IFNULL(sum(bddd.num),0) from bus_sales_order_discount bddd left join bus_sales_order bo on bo.sid = bddd.salesOrderSid
         where bo.contractNo = #{contractId}
     </select>
 </mapper>
\ No newline at end of file