Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleService.java

@@ -148,7 +148,8 @@ public class BusHandoverPrepareVehicleService extends MybatisBaseService<BusHand
                 List<BusVehicleInformation> busVehicleInformationList = busVehicleInformationService.selectByMainSids(busVehicleInformationHandover.getSid());
                 busVehicleInformationList.removeAll(Collections.singleton(null));
                 if (busVehicleInformationList.isEmpty() && !vo.isOnBoardDataState()) {
-                    vo.setOnBoardDataStateStr("接收确认");
+//                    vo.setOnBoardDataStateStr("接收确认");
+                    vo.setOnBoardDataState(false);
                 }else{
                     //随车资料的状态控制
                     if(busVehicleInformationHandover.getCompleteState() == 0){//未完成
@@ -159,6 +160,7 @@ public class BusHandoverPrepareVehicleService extends MybatisBaseService<BusHand
                             HandoverInformationIntemVo handoverInformationIntemVo = listTwo.get(0);
                             if(StringUtils.isBlank(handoverInformationIntemVo.getRecTime())){
                                 vo.setOnBoardDataState(false);
+                                vo.setOnBoardDataStateStr("接收确认");
                             }else{
                                 vo.setOnBoardDataState(true);
                             }