修改

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java

@@ -535,6 +535,12 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
         List<BusHandoverPrepareVehicle> busHandoverPrepareVehicleList = busHandoverPrepareVehicleService.selectByApplySid(dto.getSid());
         busHandoverPrepareVehicleList.removeAll(Collections.singleton(null));
         if (!busHandoverPrepareVehicleList.isEmpty()) {
+            List<String> vinSidList  = busHandoverPrepareVehicleList.stream().map(v->v.getVinSid()).collect(Collectors.toList());
+            //查询车辆的随车资料是否都已移交
+            List<String> countList = busVehicleInformationHandoverService.selectByVinSid(vinSidList);
+            if(!countList.isEmpty()){
+                return rb.setMsg("车辆："+String.join(",",countList)+"随车资料未完成交接");
+            }
             String sid = dto.getSid();
             for (BusHandoverPrepareVehicle handoverPrepareVehicle : busHandoverPrepareVehicleList) {
                 BusHandoverWaitDto busHandoverWaitDto = new BusHandoverWaitDto();
@@ -542,7 +548,7 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
                 busHandoverWaitDto.setCustomerName(busHandoverPrepare.getCustomerName());
                 busHandoverWaitDto.setCustomerSid(busHandoverPrepare.getCustomerSid());
                 busHandoverWaitDto.setVinNo(handoverPrepareVehicle.getVinNo());
-                busHandoverWaitDto.setVinNo(handoverPrepareVehicle.getVinSid());
+                busHandoverWaitDto.setVinSid(handoverPrepareVehicle.getVinSid());
                 busHandoverWaitDto.setModelSid(busHandoverPrepare.getModelSid());
                 busHandoverWaitDto.setModelName(busHandoverPrepare.getModel());
                 busHandoverWaitDto.setPayStateKey(handoverPrepareVehicle.getSubscriptionKey());

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverMapper.java

@@ -9,6 +9,8 @@ import com.yxt.anrui.buscenter.api.busvehicleinformationhandover.BusVehicleInfor
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * @author Administrator
  * @description
@@ -23,4 +25,6 @@ public interface BusVehicleInformationHandoverMapper extends BaseMapper<BusVehic
     BusVehicleInformationHandover getVehicleInformationInfo(@Param("sid") String sid);
 
     BusVehicleInformationHandover detailsByVinSid(@Param("sid")String sid);
+
+    List<String> selectByVinSid(@Param("list") List<String> vinSidList);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverMapper.xml

@@ -45,4 +45,12 @@
         from bus_vehicle_information_handover
         where vehicleSid = #{sid}
     </select>
+
+    <select id="selectByVinSid" resultType="java.lang.String">
+        select bh.vinNo
+        from bus_vehicle_information_handover bh where (bh.transferStateKey = '001' or bh.transferStateKey = '002' or bh.transferStateKey = '003') and bh.vehicleSid in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverService.java

@@ -500,4 +500,8 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus
         vo.setInformations(voList);
         return rb.success().setData(vo);
     }
+
+    public List<String> selectByVinSid(List<String> vinSidList) {
+        return baseMapper.selectByVinSid(vinSidList);
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/AppBusHandoverPrepareFeign.java

@@ -118,7 +118,7 @@ public interface AppBusHandoverPrepareFeign {
     @ApiOperation("提交交车准备信息")
     @PostMapping("/submitDeliveryPlanInfo")
     @ResponseBody
-    ResultBean submitDeliveryPlanInfo(@RequestBody HandoverPrepareDto dto);
+    ResultBean submitDeliveryPlanInfo(@SpringQueryMap HandoverPrepareDto dto);
 
     @ApiOperation("获取随车资料信息")
     @GetMapping("/getCarDataInfo")