Merge remote-tracking branch 'origin/master'

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>

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("接收确认");
+                        }
+
                     }
                 }
             }

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>