diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java index 7f395c1451..59b125ba9f 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java @@ -31,7 +31,8 @@ public enum BillTypeEnum { XSDDTCSQ("XSDDTCSQ", "销售订单退车申请"), QKTCSQ("QKTCSQ", "欠款提车申请"), GCCKSQ("GCCKSQ", "挂车出库申请"), - JCZLQRD("JCZLQRD", "交车资料确认单"); + JCZLQRD("JCZLQRD", "交车资料确认单"), + JCECQRD("JCECQRD", "交车资料二次确认单"); private String billType; private String billTypeName; 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 2973b0ee86..e13f843f5b 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 @@ -882,7 +882,7 @@ public class BusHandoverService extends MybatisBaseService 0) { + if (prepareVehicle.getOnBoardDataState() == 0 || prepareVehicle.getOnBoardDataState() == 1) { BusVehicleInformationHandoverDetailsListVo data = busVehicleInformationHandoverService.detailsByVinSid(handoverWait.getVinSid()).getData(); if (null != data) { if (data.getInformations().size() > 0) { @@ -1596,7 +1596,7 @@ public class BusHandoverService extends MybatisBaseService 0) { + if (prepareVehicle.getOnBoardDataState() == 0 || prepareVehicle.getOnBoardDataState() == 1) { BusVehicleInformationHandoverDetailsListVo data = busVehicleInformationHandoverService.detailsByVinSid(handoverWait.getVinSid()).getData(); if (null != data) { if (data.getInformations().size() > 0) { diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitService.java index 90495929a9..79158b998e 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitService.java @@ -46,9 +46,6 @@ public class BusHandoverWaitService extends MybatisBaseService pagging = baseMapper.selectPageVo(page, qw, params.getName()); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverMapper.xml index 1a552b9715..660c35129e 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverMapper.xml @@ -50,7 +50,7 @@ ORDER BY bvh.createTime DESC