交车确认优化

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;

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<BusHandoverMapper, Bu
                         sb.append("合格证").append("、");
                         sbKey.append("002").append("、");
                     }
-                    if (prepareVehicle.getOnBoardDataState() > 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<BusHandoverMapper, Bu
                         sb.append("合格证").append("、");
                         sbKey.append("002").append("、");
                     }
-                    if (prepareVehicle.getOnBoardDataState() > 0) {
+                    if (prepareVehicle.getOnBoardDataState() == 0 || prepareVehicle.getOnBoardDataState() == 1) {
                         BusVehicleInformationHandoverDetailsListVo data = busVehicleInformationHandoverService.detailsByVinSid(handoverWait.getVinSid()).getData();
                         if (null != data) {
                             if (data.getInformations().size() > 0) {

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<BusHandoverWaitMa
                 orgPath = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData();
                 qw.eq("bh.useOrgSid", orgPath);
             }
-            if (StringUtils.isNotBlank(params.getUserSid())) {
-                qw.eq("bh.createBySid", params.getUserSid());
-            }
             qw.eq("bh.isDelete", 0);
         }
         IPage<BusHandoverWaitVo> pagging = baseMapper.selectPageVo(page, qw, params.getName());

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
     </select>
     <select id="selectByNo" resultType="com.yxt.anrui.buscenter.api.busvehicledatahandover.AppVinListVo">
-        select vinNo as vin, sid as recordSid,billNo as billId
+        select vinNo as vin, sid as recordSid, billNo as billId
         from bus_vehicle_data_handover
         where contractNo = #{contractNo}
           and completeStateKey = '001'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverService.java

@@ -300,7 +300,7 @@ public class BusVehicleDataHandoverService extends MybatisBaseService<BusVehicle
         String orgCode = resultBean1.getData().getOrgCode();
         BillNo b = new BillNo();
         b.setOrgCode(orgCode);
-        b.setBillType(BillTypeEnum.JCZLQRD.getBillType());
+        b.setBillType(BillTypeEnum.JCECQRD.getBillType());
         String bill = Rule.getBill(b);
         int i = baseMapper.selectNum(bill);
         String billNo = Rule.getBillNo(bill, i);