交车确认

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusExitPermitVo.java

@@ -0,0 +1,48 @@
+package com.yxt.anrui.buscenter.api.bushandover;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/6/5 16:06
+ */
+@Data
+public class BusExitPermitVo implements Vo {
+    @ApiModelProperty("分公司简称")
+    private String orgName;
+    @ApiModelProperty("日期")
+    private String date;
+    @ApiModelProperty("申请人")
+    private String apply;
+    @ApiModelProperty("合同编号")
+    private String contract;
+    @ApiModelProperty("客户名称")
+    private String name;
+    @ApiModelProperty("台数")
+    private String number;
+    @ApiModelProperty("车型")
+    private String modelName;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("出门原因")
+    private String reason;
+    @ApiModelProperty("业务经办人")
+    private String operator;
+    @ApiModelProperty("财务经办人")
+    private String finOperator;
+    @ApiModelProperty("提车人")
+    private String carCollector;
+    @ApiModelProperty("出门签章")
+    private String signature;
+
+}
+
+
+
+
+

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandover.java

@@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * Project: anrui-buscenter(业务中心) <br/>
  * File: BusHandover.java <br/>
@@ -26,43 +28,41 @@ public class BusHandover extends BaseEntity {
     private static final long serialVersionUID = 1L;
     @ApiModelProperty("合同编号")
     private String contractNo;
-
     @ApiModelProperty("订单sid")
     private String orderSid;
-
     @ApiModelProperty("业务员sid")
     private String staffSid;
-
     @ApiModelProperty("客户名称")
     private String customerName;
-
     @ApiModelProperty("客户sid")
     private String customerSid;
-
     @ApiModelProperty("身份证号")
     private String idNo;
-
+    @ApiModelProperty("交车数量")
+    private String carNum;
+    @ApiModelProperty("车型")
+    private String modelName;
     @ApiModelProperty("联系电话")
     private String mobile;
-
     @ApiModelProperty("交付日期")
-    private String deliverDate;
+    private Date deliverDate;
-
     @ApiModelProperty("交付地点")
     private String deliverAddress;
-
     @ApiModelProperty("接收人")
     private String recipient;
-
     @ApiModelProperty("交车状态")
     private String handoverStateKey;
-
     @ApiModelProperty("交车状态value")
     private String handoverStateValue;
-
     @ApiModelProperty("交车定位经纬度")
     private String locationCode;
-
     @ApiModelProperty("分公司sid")
     private String useOrgSid;
+    @ApiModelProperty("分公司名")
+    private String useOrgName;
+    @ApiModelProperty("付款方式key")
+    private String payTypeKey;
+    @ApiModelProperty("付款方式value")
+    private String payTypeValue;
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverDeliveryDto.java

@@ -0,0 +1,61 @@
+package com.yxt.anrui.buscenter.api.bushandover;
+
+import com.yxt.anrui.buscenter.api.bushandoveritems.BusHandoverItemForDeliveryDto;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/6/2 11:24
+ */
+@Data
+public class BusHandoverDeliveryDto implements Dto {
+
+
+    private String sid;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("交车数量")
+    private String carNum;
+    @ApiModelProperty("订单sid")
+    private String orderSid;
+    @ApiModelProperty("业务员sid")
+    private String staffSid;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("客户sid")
+    private String customerSid;
+    @ApiModelProperty("合同编号")
+    private String contractNo;
+    @ApiModelProperty("接收人")
+    private String recipient;
+    @ApiModelProperty("身份证号")
+    private String idNo;
+    @ApiModelProperty("联系电话")
+    private String mobile;
+    @ApiModelProperty("车辆交付日期")
+    private Date deliverDate;
+    @ApiModelProperty("车辆交付地点")
+    private String deliverAddress;
+    @ApiModelProperty("交车定位经纬度")
+    private String locationCode;
+    @ApiModelProperty("付款方式key")
+    private String payTypeKey;
+    @ApiModelProperty("车型")
+    private String modelName;
+    @ApiModelProperty("付款方式value")
+    private String payTypeValue;
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
+    @ApiModelProperty("分公司sid")
+    private String useOrgName;
+    @ApiModelProperty("交车资料")
+    private List<BusHandoverItemForDeliveryDto> busItemvos;
+
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverDeliveryVo.java

@@ -0,0 +1,39 @@
+package com.yxt.anrui.buscenter.api.bushandover;
+
+import com.yxt.anrui.buscenter.api.bushandoveritems.BusHandoverItemForDeliveryVo;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/5/30 13:56
+ */
+@Data
+public class BusHandoverDeliveryVo implements Vo {
+
+    @ApiModelProperty("交车数量")
+    private String carNum;
+    @ApiModelProperty("订单sid")
+    private String orderSid;
+    @ApiModelProperty("业务员sid")
+    private String staffSid;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("客户sid")
+    private String customerSid;
+    @ApiModelProperty("合同编号")
+    private String contractNo;
+    @ApiModelProperty("付款方式key")
+    private String payTypeKey;
+    @ApiModelProperty("车型")
+    private String modelName;
+    @ApiModelProperty("付款方式value")
+    private String payTypeValue;
+    @ApiModelProperty("交车资料")
+    private List<BusHandoverItemForDeliveryVo> busItemvos;
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverDto.java

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -39,7 +40,7 @@ public class BusHandoverDto implements Dto {
     @ApiModelProperty("联系电话")
     private String mobile;
     @ApiModelProperty("车辆交付日期")
-    private String deliverDate;
+    private Date deliverDate;
 
     @ApiModelProperty("车辆交付地点")
     private String deliverAddress;

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverFeign.java

@@ -31,6 +31,34 @@ import java.util.List;
         fallback = BusHandoverFeignFallback.class)
 public interface BusHandoverFeign {
 
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<BusHandoverVos>> listPage(@RequestBody PagerQuery<BusHandoverQuery> pq);
+
+
+    @ApiOperation("确认交付信息回显")
+    @PostMapping("/deliveryByHandoverWaitSids")
+    @ResponseBody
+    public ResultBean<BusHandoverDeliveryVo> deliveryByHandoverWaitSids(@RequestBody String[] sids);
+
+
+    @ApiOperation("保存确认交付信息")
+    @PostMapping("/saveOrUpdateBusHandover")
+    ResultBean<String> saveOrUpdateBusHandover(@RequestBody BusHandoverDeliveryDto dto) throws Exception;
+
+
+    @ApiOperation("打印接收车辆确认书、出门证、交车资料确认单")
+    @PostMapping("/createPdf")
+    ResultBean<List<String>> createPdf(@RequestParam("sid") String sid);
+
+//    @ApiOperation("打印出门证")
+//    @PostMapping("/exitPermit")
+//    ResultBean<String> exitPermit(String sid);
+//
+
+
  /*   @ApiOperation("根据条件分页查询数据的列表")
     @PostMapping("/listPage")
     public ResultBean<PagerVo<BusHandoverVo>> listPage(@RequestBody PagerQuery<BusHandoverQuery> pq);

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverFeignFallback.java

@@ -22,6 +22,31 @@ import java.util.List;
  */
 @Component
 public class BusHandoverFeignFallback implements BusHandoverFeign {
+    @Override
+    public ResultBean<PagerVo<BusHandoverVos>> listPage(PagerQuery<BusHandoverQuery> pq) {
+        return null;
+    }
+
+    @Override
+    public ResultBean deliveryByHandoverWaitSids(String[] sids) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<String> saveOrUpdateBusHandover(BusHandoverDeliveryDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<String>> createPdf(String sid) {
+        return null;
+    }
+//
+//    @Override
+//    public ResultBean<String> exitPermit(String sid) {
+//        return null;
+//    }
+
     @Override
     public ResultBean<List<BusHandoverListVo>> saveDeliverybill(BusHandoverDto dto) {
         return null;

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverQuery.java

@@ -32,4 +32,12 @@ public class BusHandoverQuery implements Query {
     @ApiModelProperty("orgPath")
     private String orgPath;
 
+    @ApiModelProperty("合同编号")
+    private String contractNo;
+
+    @ApiModelProperty("客户名称")
+    private String customerName;
+
+    @ApiModelProperty("付款方式value")
+    private String payTypeValue;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverVos.java

@@ -0,0 +1,30 @@
+package com.yxt.anrui.buscenter.api.bushandover;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/6/5 10:22
+ */
+@Data
+public class BusHandoverVos implements Vo {
+
+    @ApiModelProperty("交车状态value")
+    private String handoverStateValue;
+    @ApiModelProperty("合同编号")
+    private String contractNo;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("交车数量")
+    private String carNum;
+    @ApiModelProperty("车型")
+    private String modelName;
+    @ApiModelProperty("显示办理")
+    private Boolean showComplete;
+    @ApiModelProperty("显示挂车")
+    private Boolean showTrailer;
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusReceiveVehicleListPdfVo.java

@@ -0,0 +1,18 @@
+package com.yxt.anrui.buscenter.api.bushandover;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/6/5 12:03
+ */
+@Data
+public class BusReceiveVehicleListPdfVo implements Vo {
+    private String sNo;
+    private String sortNo;
+    private String vinNo;
+    private String engineVo;
+    private String vehicleHandoverData;
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusReceiveVehiclePdfVo.java

@@ -0,0 +1,45 @@
+package com.yxt.anrui.buscenter.api.bushandover;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/6/5 11:52
+ */
+@Data
+public class BusReceiveVehiclePdfVo implements Vo {
+    @ApiModelProperty("分公司名")
+    private String useOrgName;
+    @ApiModelProperty("业务员")
+    private String staffName;
+    @ApiModelProperty("合同编号")
+    private String contractNo;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("证件号码")
+    private String idNo;
+    @ApiModelProperty("接收人")
+    private String recipient;
+    @ApiModelProperty("身份证号")
+    private String idNumber;
+    @ApiModelProperty("交付日期")
+    private Date deliverDate;
+    @ApiModelProperty("交付地点")
+    private String deliverAddress;
+    @ApiModelProperty("品牌")
+    private String brandName;
+    @ApiModelProperty("车型")
+    private String model;
+    @ApiModelProperty("颜色")
+    private String color;
+    @ApiModelProperty("车辆型号")
+    private String config;
+    private List<BusReceiveVehicleListPdfVo> listPdfVos;
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItemForDeliveryDto.java

@@ -0,0 +1,29 @@
+package com.yxt.anrui.buscenter.api.bushandoveritems;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/6/2 11:27
+ */
+@Data
+public class BusHandoverItemForDeliveryDto implements Dto {
+
+    private String handoverSid;
+    private String modelSid;
+    private String modelName;
+    private String vinSid;
+    private String vinNo;
+    private String itemKey;
+    private String itemValue;
+    private List<String> handoverPhoto;
+    private List<String> policyPhoto;
+    @ApiModelProperty("是否是燃气车 0不是1是")
+    private String isFuelVehicle; // 是否是燃气车 0不是1是
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItemForDeliveryVo.java

@@ -0,0 +1,23 @@
+package com.yxt.anrui.buscenter.api.bushandoveritems;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/5/30 13:59
+ */
+@Data
+public class BusHandoverItemForDeliveryVo implements Vo {
+
+    private String modelSid;
+    private String modelName;
+    private String vinSid;
+    private String vinNo;
+    private String itemValue;
+    @ApiModelProperty("是否是燃气车 0不是1是")
+    private String isFuelVehicle; // 是否是燃气车 0不是1是
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItems.java

@@ -3,6 +3,7 @@ package com.yxt.anrui.buscenter.api.bushandoveritems;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yxt.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -39,6 +40,7 @@ public class BusHandoverItems extends BaseEntity {
     private String handoverPhoto;
 
     private String policyPhoto;
-
+    @ApiModelProperty("是否是燃气车 0不是1是")
+    private String isFuelVehicle; // 是否是燃气车 0不是1是
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItemsFeign.java

@@ -6,6 +6,10 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
 
 /**
  * Project: anrui-buscenter(业务中心) <br/>
@@ -51,4 +55,13 @@ public interface BusHandoverItemsFeign {
     @ApiOperation("获取交车交付信息")
     @PostMapping("/getDeliveryBill")
     ResultBean<BusHandoverItemsVo> getDeliveryBill(@RequestBody BusHandoverItemsQuery query);
+
+    @ApiOperation("获取交车办理车辆")
+    @PostMapping("/getItemsList")
+    ResultBean<List<BusHandoverItems>> getItemsList();
+
+    @ApiOperation("根据交车确认单sid获取交车办理车辆")
+    @PostMapping("/getItemsListByMainSid")
+    @ResponseBody
+    ResultBean<List<BusHandoverItems>> getItemsListByMainSid(@RequestParam("handoverSid") String handoverSid);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItemsFeignFallback.java

@@ -3,6 +3,8 @@ package com.yxt.anrui.buscenter.api.bushandoveritems;
 import com.yxt.common.core.result.ResultBean;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * Project: anrui-buscenter(业务中心) <br/>
  * File: BusHandoverItemsFeignFallback.java <br/>
@@ -24,6 +26,16 @@ public class BusHandoverItemsFeignFallback implements BusHandoverItemsFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<List<BusHandoverItems>> getItemsList() {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<BusHandoverItems>> getItemsListByMainSid(String sid) {
+        return null;
+    }
+
    /* @Override
     public ResultBean<PagerVo<BusHandoverItemsVo>> listPage(PagerQuery<BusHandoverItemsQuery> pq) {
         ResultBean rb = ResultBean.fireFail();

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/BusHandoverPrepareVehicleFeign.java

@@ -75,4 +75,9 @@ public interface BusHandoverPrepareVehicleFeign {
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody
     public ResultBean<BusHandoverPrepareVehicleDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("根据车辆sid获取记录")
+    @GetMapping("/fetchDetailsByVinSid")
+    @ResponseBody
+    public ResultBean<BusHandoverPrepareVehicle> fetchDetailsByVinSid(@RequestParam("vinSid") String vinSid);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/BusHandoverPrepareVehicleFeignFallback.java

@@ -69,4 +69,10 @@ public class BusHandoverPrepareVehicleFeignFallback implements BusHandoverPrepar
 		ResultBean rb = ResultBean.fireFail();
 		return rb.setMsg("接口bus_handover/bushandoverpreparevehicle/fetchDetailsBySid无法访问");
 	}
+
+	@Override
+	public ResultBean<BusHandoverPrepareVehicle> fetchDetailsByVinSid(String vinSid) {
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口bus_handover/bushandoverpreparevehicle/fetchDetailsByVinSid无法访问");
+	}
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWaitDto.java

@@ -13,6 +13,10 @@ import lombok.Data;
 public class BusHandoverWaitDto implements Dto {
     private static final long serialVersionUID = -5302962276174024782L;
 
+    private String sid;
+    @ApiModelProperty("创建人sid")
+    private String createBySid;
+
     @ApiModelProperty("合同编号")
     private String contractNo;
 
@@ -39,6 +43,7 @@ public class BusHandoverWaitDto implements Dto {
 
     @ApiModelProperty("付款状态value")
     private String payStateValue;
+
     @ApiModelProperty("车型sid")
     private String modelSid;
 

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWaitFeign.java

@@ -23,6 +23,20 @@ import org.springframework.web.bind.annotation.ResponseBody;
         fallback = BusHandoverWaitFeignFallback.class)
 public interface BusHandoverWaitFeign {
 
+
+    @ApiOperation("待交车车辆列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    ResultBean<PagerVo<BusHandoverWaitListPageVo>> listPage(@RequestBody PagerQuery<BusHandoverWaitListPageQuery> pagerQuery);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/saveOrUpdate")
+    @ResponseBody
+    public ResultBean<String> saveOrUpdate(@RequestBody BusHandoverWaitDto dto);
+
+
+
+    /**********************************************************************************************************************/
     @ApiOperation("待交车车辆列表")
     @PostMapping("/pagerList")
     @ResponseBody

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWaitFeignFallback.java

@@ -1,12 +1,34 @@
 package com.yxt.anrui.buscenter.api.bushandoverwait;
 
-import org.springframework.stereotype.Controller;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
 
 /**
  * @Author dimengzhe
  * @Date 2022/11/10 19:45
  * @Description
  */
-@Controller
+@Component
-public class BusHandoverWaitFeignFallback {
+public class BusHandoverWaitFeignFallback implements BusHandoverWaitFeign{
+    @Override
+    public ResultBean<PagerVo<BusHandoverWaitListPageVo>> listPage(PagerQuery<BusHandoverWaitListPageQuery> pagerQuery) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<String> saveOrUpdate(BusHandoverWaitDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<PagerVo<BusHandoverWaitVo>> pagerList(PagerQuery<BusHandoverWaitQuery> pagerQuery) {
+        return null;
+    }
+
+    @Override
+    public ResultBean save(BusHandoverWaitDto dto) {
+        return null;
+    }
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWaitListPageQuery.java

@@ -0,0 +1,27 @@
+package com.yxt.anrui.buscenter.api.bushandoverwait;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/5/29 16:18
+ */
+@Data
+public class BusHandoverWaitListPageQuery implements Query {
+
+    private String userSid;
+
+    private String useOrgSid;
+
+    @ApiModelProperty("合同编号")
+    private String contractNo;
+
+    @ApiModelProperty("车架号")
+    private String vinNo;
+
+    @ApiModelProperty("客户名称")
+    private String customerName;
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWaitListPageVo.java

@@ -0,0 +1,35 @@
+package com.yxt.anrui.buscenter.api.bushandoverwait;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/5/29 16:06
+ */
+@Data
+public class BusHandoverWaitListPageVo implements Vo {
+
+    private String sid;
+    @ApiModelProperty("合同编号")
+    private String contractNo;
+
+    @ApiModelProperty("客户名称")
+    private String customerName;
+
+    @ApiModelProperty("付款方式")
+    private String payTypeValue;
+
+    @ApiModelProperty("付款状态value")
+    private String payStateValue;
+
+    @ApiModelProperty("车架号")
+    private String vinNo;
+
+    @ApiModelProperty("车型")
+    private String modelName;
+
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWaitQuery.java

@@ -17,4 +17,5 @@ public class BusHandoverWaitQuery implements Query {
     private String name;
 
     private String orgPath;
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverDetailsListVo.java

@@ -24,6 +24,8 @@ public class BusVehicleInformationHandoverDetailsListVo implements Vo {
     private String vinNo;
     @ApiModelProperty("车型")
     private String model;
+    @ApiModelProperty("车型")
+    private String modelSid;
     @ApiModelProperty("合同号")
     private String contractNo;
     @ApiModelProperty("客户名称")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverFeign.java

@@ -59,4 +59,11 @@ public interface BusVehicleInformationHandoverFeign {
     @ResponseBody
     public ResultBean<BusVehicleInformationHandoverDetailsListVo> details(@PathVariable("sid") String sid);
 
+    @ApiOperation("随车资料交接详情")
+    @GetMapping("/detailsByVinSid/{sid}")
+    @ResponseBody
+    public ResultBean<BusVehicleInformationHandoverDetailsListVo> detailsByVinSid(@PathVariable("sid") String sid);
+
+
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverFeignFallback.java

@@ -47,4 +47,9 @@ public class BusVehicleInformationHandoverFeignFallback implements BusVehicleInf
     public ResultBean<BusVehicleInformationHandoverDetailsListVo> details(String sid) {
         return null;
     }
+
+    @Override
+    public ResultBean<BusVehicleInformationHandoverDetailsListVo> detailsByVinSid(String sid) {
+        return null;
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverMapper.java

@@ -4,10 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.yxt.anrui.buscenter.api.bushandover.BusHandover;
+import com.yxt.anrui.buscenter.api.bushandover.*;
-import com.yxt.anrui.buscenter.api.bushandover.BusHandoverDetailsVo;
-import com.yxt.anrui.buscenter.api.bushandover.BusHandoverInitVo;
-import com.yxt.anrui.buscenter.api.bushandover.BusHandoverVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -38,6 +35,8 @@ public interface BusHandoverMapper extends BaseMapper<BusHandover> {
 
     int selectByCount(@Param("contractNo") String contractNo, @Param("vinSidList") List<String> vinSidList);
 
+    IPage<BusHandoverVos> selectListPageVo(IPage<BusHandover> page,@Param(Constants.WRAPPER) QueryWrapper<BusHandover> qw);
+
 	/*//@Update("update bus_handover set name=#{msg} where id=#{id}")
 	//IPage<BusHandoverVo> voPage(IPage<BusHandover> page, @Param(Constants.WRAPPER) QueryWrapper<BusHandover> qw);
 	

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverMapper.xml

@@ -98,4 +98,18 @@
             #{item}
         </foreach>
     </select>
+    <select id="selectListPageVo" resultType="com.yxt.anrui.buscenter.api.bushandover.BusHandoverVos">
+        select distinct
+        bh.sid,
+        bh.contractNo,
+        bh.customerName,
+        bh.handoverStateValue,
+        bh.modelName,
+        bh.carNum
+        from bus_handover bh
+        <where>
+            ${ew.sqlSegment}
+            ORDER BY createTime DESC ,id
+        </where>
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverRest.java

@@ -32,6 +32,31 @@ public class BusHandoverRest implements BusHandoverFeign {
     @Autowired
     private BusHandoverService busHandoverService;
 
+    @Override
+    public ResultBean<PagerVo<BusHandoverVos>> listPage(PagerQuery<BusHandoverQuery> pq) {
+        return busHandoverService.listPage(pq);
+    }
+
+    @Override
+    public ResultBean<BusHandoverDeliveryVo> deliveryByHandoverWaitSids(String[] sids) {
+        return busHandoverService.deliveryByHandoverWaitSids(sids);
+    }
+
+    @Override
+    public ResultBean<String> saveOrUpdateBusHandover(BusHandoverDeliveryDto dto) throws Exception {
+        return busHandoverService.saveOrUpdateBusHandover(dto);
+    }
+
+    @Override
+    public ResultBean<List<String>> createPdf(String sid) {
+        return busHandoverService.createPdf(sid);
+    }
+
+//    @Override
+//    public ResultBean<String> exitPermit(String sid) {
+//        return busHandoverService.exitPermit(sid);
+//    }
+
     @Override
     public ResultBean<List<BusHandoverListVo>> saveDeliverybill(BusHandoverDto dto) {
         return busHandoverService.saveDeliverybill(dto);

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfigFeign;
 import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfigSelectVo;
+import com.yxt.anrui.base.api.basevehicle.BaseExistingCarListVo;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
 import com.yxt.anrui.base.api.commoncontract.CommonContract;
@@ -16,17 +17,29 @@ import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFile;
 import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFileEnum;
 import com.yxt.anrui.buscenter.api.bushandover.*;
 import com.yxt.anrui.buscenter.api.bushandoveritems.*;
+import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicle;
+import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWait;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderModelInfoVo;
+import com.yxt.anrui.buscenter.api.busvehicledatahandover.BusVehicleDataHandoverDetailsVo;
+import com.yxt.anrui.buscenter.api.busvehiclehandoverdata.BusVehicleHandoverDataDetailsVo;
+import com.yxt.anrui.buscenter.api.busvehicleinformation.BusVehicleInformationVo;
+import com.yxt.anrui.buscenter.api.busvehicleinformationhandover.BusVehicleInformationHandoverDetailsListVo;
 import com.yxt.anrui.buscenter.biz.buscenterfile.BuscenterFileService;
 import com.yxt.anrui.buscenter.biz.bushandoveritems.BusHandoverItemsService;
+import com.yxt.anrui.buscenter.biz.bushandoverpreparevehicle.BusHandoverPrepareVehicleService;
 import com.yxt.anrui.buscenter.biz.bushandoverwait.BusHandoverWaitService;
 import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
+import com.yxt.anrui.buscenter.biz.busvehicleinformationhandover.BusVehicleInformationHandoverService;
 import com.yxt.anrui.crm.api.crmcustomertemp.AppCrmCustomerTempInfoVo;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
+import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
+import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoice;
+import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceFeign;
 import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoDetailsVo;
 import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoFeign;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUser;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.common.base.config.component.DocPdfComponent;
@@ -45,6 +58,7 @@ import org.springframework.stereotype.Service;
 import java.io.File;
 import java.io.InputStream;
 import java.text.MessageFormat;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.stream.Collectors;
@@ -92,6 +106,15 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
     @Autowired
     private BaseVehicleFeign baseVehicleFeign;
 
+    @Autowired
+    private BusHandoverPrepareVehicleService busHandoverPrepareVehicleService;
+
+    @Autowired
+    private BusVehicleInformationHandoverService busVehicleInformationHandoverService;
+
+    @Autowired
+    private FinVehicleInvoiceFeign finVehicleInvoiceFeign;
+
     //    @Transactional(rollbackFor = Exception.class)
     public ResultBean<List<BusHandoverListVo>> saveDeliverybill(BusHandoverDto dto) {
         ResultBean<List<BusHandoverListVo>> rb = ResultBean.fireFail();
@@ -721,6 +744,509 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
     public int selectByCount(String contractId, List<String> vinSids) {
         return baseMapper.selectByCount(contractId, vinSids);
     }
+
+    /**
+     * 确认交付信息回显
+     *
+     * @param sids
+     * @return
+     */
+
+    public ResultBean<BusHandoverDeliveryVo> deliveryByHandoverWaitSids(String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        BusHandoverDeliveryVo vo = new BusHandoverDeliveryVo();
+        List<BusHandoverItemForDeliveryVo> voList = new ArrayList<>();
+        vo.setCarNum(String.valueOf(sids.length));
+        for (String sid : sids) {
+            //遍历sid从待交车列表中查询信息
+            BusHandoverWait handoverWait = busHandoverWaitService.fetchBySid(sid);
+            if (handoverWait != null) {
+                BusHandoverItemForDeliveryVo itemVo = new BusHandoverItemForDeliveryVo();
+                CommonContract contract = commonContractFeign.selectByNo(handoverWait.getContractNo()).getData();
+                if (null != contract) {
+                    if (StringUtils.isNotBlank(contract.getBusSid())) {
+                        vo.setOrderSid(contract.getBusSid());
+                    }
+                    if (StringUtils.isNotBlank(contract.getStaffSid())) {
+                        vo.setStaffSid(contract.getStaffSid());
+                    }
+                }
+                //合同号
+                vo.setContractNo(handoverWait.getContractNo());
+                vo.setCustomerName(handoverWait.getCustomerName());
+                vo.setCustomerSid(handoverWait.getCustomerSid());
+                vo.setPayTypeKey(handoverWait.getPayTypeKey());
+                vo.setPayTypeValue(handoverWait.getPayTypeValue());
+                vo.setModelName(handoverWait.getModelName());
+                itemVo.setVinSid(handoverWait.getVinSid());
+                itemVo.setVinNo(handoverWait.getVinNo());
+                itemVo.setModelSid(handoverWait.getModelSid());
+                itemVo.setModelName(handoverWait.getModelName());
+                StringBuffer sb = new StringBuffer();
+                //从交车准备中查询交车资料
+                BusHandoverPrepareVehicle prepareVehicle = busHandoverPrepareVehicleService.fetchDetailsByVinSid(handoverWait.getVinSid());
+                if (null != prepareVehicle) {
+                    if (prepareVehicle.getInvoicingState() > 0) {
+                        sb.append("发票、");
+                    }
+                    if (prepareVehicle.getCertificateState() > 0) {
+                        sb.append("合格证、");
+                    }
+                    if (prepareVehicle.getOnBoardDataState() > 0) {
+                        BusVehicleInformationHandoverDetailsListVo data = busVehicleInformationHandoverService.detailsByVinSid(handoverWait.getVinSid()).getData();
+                        if (null != data) {
+                            itemVo.setIsFuelVehicle(data.getIsFuelVehicle());
+                            if (data.getInformations().size() > 0) {
+                                List<BusVehicleInformationVo> informations = data.getInformations();
+                                String keyNum = "";
+                                for (BusVehicleInformationVo information : informations) {
+                                    keyNum = information.getVehicleKeyNum();
+                                }
+                                if (Integer.parseInt(data.getIsFuelVehicle()) > 0) {
+                                    //0是燃气车 1不是燃气车
+                                    sb.append(keyNum + "把车钥匙、一致性证书、申请表、保修手册、说明书、环保清单、驾驶员卡、");
+                                } else {
+                                    sb.append(keyNum + "把车钥匙、一致性证书、申请表、保修手册、说明书、环保清单、驾驶员卡、气瓶产品质量证书（燃气车）、");
+                                }
+                            }
+                        }
+                    }
+                    sb.delete(sb.length() - 1, sb.length());
+                    itemVo.setItemValue(sb.toString());
+                }
+                voList.add(itemVo);
+            }
+        }
+        vo.setBusItemvos(voList);
+        return rb.success().setData(vo);
+    }
+
+    /**
+     * 保存交车确认信息，并打印《接收车辆确认书》、《出门证》、《交车资料确认单》
+     *
+     * @param dto
+     * @return
+     */
+    public ResultBean<String> saveOrUpdateBusHandover(BusHandoverDeliveryDto dto) throws Exception {
+        ResultBean rb = ResultBean.fireFail();
+        BusHandover entity = new BusHandover();
+        String sid = entity.getSid();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        entity.setHandoverStateKey("001");
+        entity.setHandoverStateValue("未完成");
+        if (StringUtils.isNotBlank(dto.getUserSid())) {
+            entity.setCreateBySid(dto.getUserSid());
+        }
+        baseMapper.insert(entity);
+        List<BusHandoverItemForDeliveryDto> busItemvos = dto.getBusItemvos();
+        for (BusHandoverItemForDeliveryDto busItemvo : busItemvos) {
+            BusHandoverItems items = new BusHandoverItems();
+            BeanUtil.copyProperties(busItemvo, items);
+            items.setHandoverSid(sid);
+            busHandoverItemsService.insert(items);
+        }
+        //打印pdf
+        List<String> filePaths = createPdf(entity.getSid()).getData();
+        List<File> fileList = new ArrayList<>();
+        if (!filePaths.isEmpty()) {
+            for (String filePath : filePaths) {
+                File file = new File(filePath);
+                fileList.add(file);
+            }
+        }
+        String path = "";
+        String filePath = "/template/";
+        String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
+        long seconds = System.currentTimeMillis();
+        String targetPath = docPdfComponent.getUploadTemplateUrl();
+        File file = WordConvertUtils.mulFile2One(fileList, targetPath + dateStr + seconds + "交车确认.pdf");
+        if (fileList.size() <= 0) {
+            path = null;
+        } else {
+            for (File fileDelete : fileList) {
+                fileDelete.delete();
+            }
+            path = filePath + dateStr + seconds + "交车确认.pdf";
+        }
+        return rb.success().setData(path);
+    }
+
+    /**
+     * 打印《接收车辆确认书》
+     */
+    public ResultBean<List<String>> createPdf(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        BusHandover busHandover = fetchBySid(sid);
+        //接收车辆确认书、交车资料确认单
+        BusReceiveVehiclePdfVo pdfVo = new BusReceiveVehiclePdfVo();
+        //出门证
+        BusExitPermitVo permitVo = new BusExitPermitVo();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        if (null != busHandover) {
+            if (StringUtils.isNotBlank(busHandover.getPayTypeValue())) {
+                if ("全款".equals(busHandover.getPayTypeValue())) {
+                    permitVo.setReason("全款交车");
+                } else if ("贷款".equals(busHandover.getPayTypeValue())) {
+                    permitVo.setReason("消贷交车");
+                }
+            }
+            //申请人
+            if (StringUtils.isNotBlank(busHandover.getCreateBySid())) {
+                SysUser sysUser = sysUserFeign.selectBySid(busHandover.getCreateBySid()).getData();
+                SysStaffinfoDetailsVo staffinfoDetailsVo = sysStaffinfoFeign.fetchBySid(sysUser.getStaffSid()).getData();
+                permitVo.setApply(staffinfoDetailsVo.getName());
+            }
+            if (StringUtils.isNotBlank(busHandover.getUseOrgName())) {
+                permitVo.setOrgName(busHandover.getUseOrgName());
+            }
+            if (StringUtils.isNotBlank(sdf.format(busHandover.getDeliverDate()))) {
+                permitVo.setDate(sdf.format(busHandover.getDeliverDate()));
+            }
+            if (StringUtils.isNotBlank(busHandover.getContractNo())) {
+                permitVo.setContract(busHandover.getContractNo());
+                List<FinVehicleInvoice> invoices = finVehicleInvoiceFeign.selectByContractNo(busHandover.getContractNo()).getData();
+                if (!invoices.isEmpty()) {
+                    for (FinVehicleInvoice invoice : invoices) {
+                        permitVo.setFinOperator(invoice.getDrawer());
+                    }
+                }
+            }
+            if (StringUtils.isNotBlank(busHandover.getCustomerName())) {
+                permitVo.setName(busHandover.getCustomerName());
+            }
+            if (StringUtils.isNotBlank(busHandover.getCarNum())) {
+                permitVo.setNumber(busHandover.getCarNum());
+            }
+            //====================================================
+            BeanUtil.copyProperties(busHandover, pdfVo);
+            pdfVo.setModel(busHandover.getModelName());
+            String customerSid = busHandover.getCustomerSid();
+            ResultBean<CrmCustomerTempVo> resultBean = crmCustomerTempFeign.fetchSid(customerSid);
+            if (resultBean.getSuccess()) {
+                if (null != resultBean.getData()) {
+                    CrmCustomerTempVo data = resultBean.getData();
+                    if (StringUtils.isNotBlank(data.getIDNumber())) {
+                        pdfVo.setIdNumber(data.getIDNumber());
+                    }
+                }
+            }
+            String staffSid = busHandover.getStaffSid();
+            ResultBean<SysStaffinfoDetailsVo> voResultBean = sysStaffinfoFeign.fetchBySid(staffSid);
+            if (voResultBean.getSuccess()) {
+                if (null != voResultBean.getData()) {
+                    SysStaffinfoDetailsVo data = voResultBean.getData();
+                    if (StringUtils.isNotBlank(data.getName())) {
+                        pdfVo.setStaffName(data.getName());
+                        //出门证业务经办人
+                        permitVo.setOperator(data.getName());
+                    }
+                }
+            }
+            //查询交车车辆
+            List<BusHandoverItems> items = busHandoverItemsService.getItemsListByMainSid(sid).getData();
+            List<BusReceiveVehicleListPdfVo> listPdfVos = new ArrayList<>();
+            StringBuffer sbVin = new StringBuffer();
+            StringBuffer sbModel = new StringBuffer();
+            if (items.size() > 0) {
+                int sNo = 1;
+                int sortNo = 1;
+                for (BusHandoverItems item : items) {
+                    BusReceiveVehicleListPdfVo listPdfVo = new BusReceiveVehicleListPdfVo();
+                    listPdfVo.setSortNo(String.valueOf(sortNo++));
+                    listPdfVo.setSNo(String.valueOf(sNo++));
+                    listPdfVo.setVinNo(item.getVinNo());
+                    listPdfVo.setVehicleHandoverData(item.getItemValue());
+                    String vinSid = item.getVinSid();
+                    BaseVehicleSelectVo vehicle = baseVehicleFeign.details(vinSid).getData();
+                    if (StringUtils.isNotBlank(vehicle.getCarBrandName())) {
+                        pdfVo.setBrandName(vehicle.getCarBrandName());
+                    }
+                    if (StringUtils.isNotBlank(vehicle.getVehMark())) {
+                        pdfVo.setConfig(vehicle.getVehMark());
+                    }
+                    if (StringUtils.isNotBlank(vehicle.getEngineNo())) {
+                        listPdfVo.setEngineVo(vehicle.getEngineNo());
+                    }
+                    listPdfVos.add(listPdfVo);
+                    String vinNo = item.getVinNo();
+                    sbVin.append(vinNo).append(",");
+                    if (StringUtils.isNotBlank(vehicle.getModelConfigSid())) {
+                        String modelConfigSid = vehicle.getModelConfigSid();
+                        BaseModelConfigSelectVo data = baseModelConfigFeign.details(modelConfigSid).getData();
+                        if (null != data) {
+                            if (StringUtils.isNotBlank(data.getCarColor())) {
+                                pdfVo.setColor(data.getCarColor());
+                                String modelName = item.getModelName();
+                                String carColor = data.getCarColor();
+                                sbModel.append(modelName + carColor).append(",");
+                            }
+                        }
+                    }
+                }
+                sbVin.delete(sbVin.length() - 1, sbVin.length());
+                sbModel.delete(sbModel.length() - 1, sbModel.length());
+                permitVo.setVinNo(sbVin.toString());
+                permitVo.setModelName(sbModel.toString());
+            }
+            pdfVo.setListPdfVos(listPdfVos);
+        }
+        List<String> filePaths = new ArrayList<>();
+        String s1 = receiveVehicleConfirmationCreatePdf(pdfVo);
+        String s2 = exitPermitCreatePdf(permitVo);
+        String s3 = commonCreatePdf(pdfVo);
+        filePaths.add(s1);
+        filePaths.add(s2);
+        filePaths.add(s3);
+        return rb.success().setData(filePaths);
+    }
+
+    /**
+     * 打印《接收车辆确认书》
+     */
+    public String receiveVehicleConfirmationCreatePdf(BusReceiveVehiclePdfVo pdfVo) {
+        Map<String, Object> dataMap = new HashMap<String, Object>();
+        List<BusReceiveVehicleListPdfVo> list = pdfVo.getListPdfVos();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        List<Map<String, Object>> newList = new ArrayList<>();
+        dataMap.put("contractNo", pdfVo.getContractNo());
+        dataMap.put("customerName", pdfVo.getCustomerName());
+        dataMap.put("useOrgName", pdfVo.getUseOrgName());
+        dataMap.put("staffName", pdfVo.getStaffName());
+        dataMap.put("idNumber", pdfVo.getIdNumber());
+        dataMap.put("recipient", pdfVo.getRecipient());
+        dataMap.put("idNo", pdfVo.getIdNo());
+        dataMap.put("deliverDate", sdf.format(pdfVo.getDeliverDate()));
+        dataMap.put("deliverAddress", pdfVo.getDeliverAddress());
+        dataMap.put("brandName", pdfVo.getBrandName());
+        dataMap.put("model", pdfVo.getModel());
+        dataMap.put("config", pdfVo.getConfig());
+        dataMap.put("color", pdfVo.getColor());
+        if (null != list && list.size() > 0) {
+            for (BusReceiveVehicleListPdfVo listPdfVo : list) {
+                Map<String, Object> map = new HashMap<>();
+                map.put("sortNo", listPdfVo.getSortNo());
+                map.put("vinNo", listPdfVo.getVinNo());
+                map.put("engineNo", listPdfVo.getEngineVo());
+                newList.add(map);
+            }
+        }
+        dataMap.put("newList", newList);
+        //获取模板
+        InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/receiveVehicleConfirmation.ftl");
+        //生成word文件名
+        String targetPath = docPdfComponent.getUploadTemplateUrl();
+        String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
+        long seconds = System.currentTimeMillis();
+        String typeName = dateStr + seconds + ".doc";
+        File file = new File(targetPath + "receiveVehicleConfirmation" + seconds + ".ftl");
+        File dir = new File(targetPath);
+        WordConvertUtils.inputStreamToFile(inputStream, file);
+        WordConvertUtils.creatWord1(dataMap, file, targetPath, typeName, dir);
+        //新生成的word路径
+        String wordPath = targetPath + typeName;
+        //生成出门证文件名
+        String pdfName = "接收车辆确认书" + dateStr + seconds + ".pdf";
+        WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName);
+        String path = targetPath + pdfName;
+        return path;
+    }
+
+    /**
+     * 随车资料
+     *
+     * @param pdfVo
+     * @return
+     */
+    public String commonCreatePdf(BusReceiveVehiclePdfVo pdfVo) {
+        Map<String, Object> dataMap = new HashMap<String, Object>();
+        List<BusReceiveVehicleListPdfVo> listPdfVos = pdfVo.getListPdfVos();
+        List<Map<String, Object>> newList = new ArrayList<>();
+        dataMap.put("contractNo", pdfVo.getContractNo());
+        dataMap.put("customerName", pdfVo.getCustomerName());
+        if (null != listPdfVos && listPdfVos.size() > 0) {
+            for (BusReceiveVehicleListPdfVo detailsVo : listPdfVos) {
+                Map<String, Object> map = new HashMap<>();
+                map.put("sNo", detailsVo.getSNo());
+                map.put("vinNo", detailsVo.getVinNo());
+                map.put("vehicleHandoverData", detailsVo.getVehicleHandoverData());
+                newList.add(map);
+            }
+        }
+        dataMap.put("newList", newList);
+        //获取模板
+        InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/vehicledatahandover.ftl");
+        //生成word文件名
+        String targetPath = docPdfComponent.getUploadTemplateUrl();
+        String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
+        long seconds = System.currentTimeMillis();
+        String typeName = dateStr + seconds + ".doc";
+        File file = new File(targetPath + "vehicledatahandover" + seconds + ".ftl");
+        File dir = new File(targetPath);
+        WordConvertUtils.inputStreamToFile(inputStream, file);
+        WordConvertUtils.creatWord1(dataMap, file, targetPath, typeName, dir);
+        //新生成的word路径
+        String wordPath = targetPath + typeName;
+        //生成出门证文件名
+        String pdfName = "交车资料确认单" + dateStr + seconds + ".pdf";
+        WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName);
+        String path = targetPath + pdfName;
+        return path;
+    }
+    /**
+     * 出门证
+     *
+     * @param sid
+     * @return
+     */
+//    public ResultBean<String> exitPermit(String sid) {
+//        ResultBean rb = ResultBean.fireFail();
+//        BusHandover busHandover = fetchBySid(sid);
+//        BusExitPermitVo permitVo = new BusExitPermitVo();
+//        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+//        if (StringUtils.isNotBlank(busHandover.getUseOrgName())) {
+//            permitVo.setOrgName(busHandover.getUseOrgName());
+//        }
+//        if (StringUtils.isNotBlank(sdf.format(busHandover.getDeliverDate()))) {
+//            permitVo.setDate(sdf.format(busHandover.getDeliverDate()));
+//        }
+//        if (StringUtils.isNotBlank(busHandover.getCreateBySid())) {
+//            SysUser sysUser = sysUserFeign.selectBySid(busHandover.getCreateBySid()).getData();
+//            SysStaffinfoDetailsVo staffinfoDetailsVo = sysStaffinfoFeign.fetchBySid(sysUser.getStaffSid()).getData();
+//            permitVo.setApply(staffinfoDetailsVo.getName());
+//        }
+//        if (StringUtils.isNotBlank(busHandover.getContractNo())) {
+//            permitVo.setContract(busHandover.getContractNo());
+//            List<FinVehicleInvoice> invoices = finVehicleInvoiceFeign.selectByContractNo(busHandover.getContractNo()).getData();
+//            if (!invoices.isEmpty()) {
+//                for (FinVehicleInvoice invoice : invoices) {
+//                    permitVo.setFinOperator(invoice.getDrawer());
+//                }
+//            }
+//        }
+//        if (StringUtils.isNotBlank(busHandover.getCustomerName())) {
+//            permitVo.setName(busHandover.getCustomerName());
+//        }
+//        if (StringUtils.isNotBlank(busHandover.getCarNum())) {
+//            permitVo.setNumber(busHandover.getCarNum());
+//        }
+//        if (StringUtils.isNotBlank(busHandover.getStaffSid())) {
+//            SysStaffinfoDetailsVo staffinfoDetailsVo = sysStaffinfoFeign.fetchBySid(busHandover.getStaffSid()).getData();
+//            permitVo.setOperator(staffinfoDetailsVo.getName());
+//        }
+//        if (StringUtils.isNotBlank(busHandover.getPayTypeValue())) {
+//            if ("全款".equals(busHandover.getPayTypeValue())) {
+//                permitVo.setReason("全款交车");
+//            } else if ("贷款".equals(busHandover.getPayTypeValue())) {
+//                permitVo.setReason("消贷交车");
+//            }
+//        }
+//        StringBuffer sbVin = new StringBuffer();
+//        StringBuffer sbModel = new StringBuffer();
+//        List<BusHandoverItems> items = busHandoverItemsService.getItemsListByMainSid(sid).getData();
+//        if (!items.isEmpty()) {
+//            for (BusHandoverItems item : items) {
+//                String vinNo = item.getVinNo();
+//                sbVin.append(vinNo).append(",");
+//                String modelName = item.getModelName();
+//                BaseVehicleSelectVo vehicle = baseVehicleFeign.details(item.getVinSid()).getData();
+//                BaseModelConfigSelectVo configSelectVo = baseModelConfigFeign.details(vehicle.getModelConfigSid()).getData();
+//                String carColor = configSelectVo.getCarColor();
+//                sbModel.append(modelName + carColor).append(",");
+//            }
+//        }
+//        sbVin.delete(sbVin.length() - 1, sbVin.length());
+//        sbModel.delete(sbModel.length() - 1, sbModel.length());
+//        permitVo.setVinNo(sbVin.toString());
+//        permitVo.setModelName(sbModel.toString());
+//        String s = exitPermitCreatePdf(permitVo);
+//        return rb.success().setData(s);
+//    }
+
+    /**
+     * 打印《出门证》
+     */
+    public String exitPermitCreatePdf(BusExitPermitVo pdfVo) {
+        Map<String, Object> dataMap = new HashMap<String, Object>();
+        List<Map<String, Object>> newList = new ArrayList<>();
+        dataMap.put("orgName", pdfVo.getOrgName());
+        dataMap.put("date", pdfVo.getDate());
+        dataMap.put("apply", pdfVo.getApply());
+        dataMap.put("contract", pdfVo.getContract());
+        dataMap.put("name", pdfVo.getName());
+        dataMap.put("number", pdfVo.getNumber());
+        dataMap.put("modelName", pdfVo.getModelName());
+        dataMap.put("vinNo", pdfVo.getVinNo());
+        dataMap.put("reason", pdfVo.getReason());
+        dataMap.put("operator", pdfVo.getOperator());
+        dataMap.put("finOperator", pdfVo.getFinOperator());
+        dataMap.put("carCollector", pdfVo.getCarCollector());
+        dataMap.put("signature", pdfVo.getSignature());
+        //获取模板
+        InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/outdoor.ftl");
+        //生成word文件名
+        String targetPath = docPdfComponent.getUploadTemplateUrl();
+        String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
+        long seconds = System.currentTimeMillis();
+        String typeName = dateStr + seconds + ".doc";
+        File file = new File(targetPath + "exitPermit" + seconds + ".ftl");
+        File dir = new File(targetPath);
+        WordConvertUtils.inputStreamToFile(inputStream, file);
+        WordConvertUtils.creatWord1(dataMap, file, targetPath, typeName, dir);
+        //新生成的word路径
+        String wordPath = targetPath + typeName;
+        //生成出门证文件名
+        String pdfName = "出门证" + dateStr + seconds + ".pdf";
+        WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName);
+        String path = targetPath + pdfName;
+        return path;
+    }
+
+
+    /**
+     * 条件构造器
+     */
+    private QueryWrapper<BusHandover> createQueryWrapper(BusHandoverQuery query) {
+        // todo: 这里根据具体业务调整查询条件
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<BusHandover> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(query.getContractNo())) {
+            qw.like("contractNo", query.getContractNo());
+        }
+        if (StringUtils.isNotBlank(query.getCustomerName())) {
+            qw.like("customerName", query.getCustomerName());
+        }
+        if (StringUtils.isNotBlank(query.getPayTypeValue())) {
+            qw.like("payTypeValue", query.getPayTypeValue());
+        }
+        qw.eq("createBySid", query.getUserSid());
+        qw.eq("isDelete", 0);
+        if (StringUtils.isNotBlank(query.getName())) {
+            qw.and(wrapper -> wrapper.like("contractNo", query.getName()).or().like("customerName", query.getName())
+                    .or().like("payTypeValue", query.getName()));
+        }
+        return qw;
+    }
+
+    /**
+     * 交车办理分页列表
+     *
+     * @param pq
+     * @return
+     */
+    public ResultBean<PagerVo<BusHandoverVos>> listPage(PagerQuery<BusHandoverQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        BusHandoverQuery query = pq.getParams();
+        QueryWrapper<BusHandover> qw = createQueryWrapper(query);
+        IPage<BusHandover> page = PagerUtil.queryToPage(pq);
+        IPage<BusHandoverVos> pagging = baseMapper.selectListPageVo(page, qw);
+        PagerVo<BusHandoverVos> p = PagerUtil.pageToVo(pagging, null);
+        return rb.success().setData(p);
+    }
+
+
+
+
+
 	/*@Autowired
 	private SysOrganizationFeign sysOrganizationFeign;
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoveritems/BusHandoverItemsMapper.java

@@ -33,6 +33,10 @@ public interface BusHandoverItemsMapper extends BaseMapper<BusHandoverItems> {
 
     List<BusItemsListVo> getListOne(String sid);
 
+    List<BusHandoverItems> getItemsList();
+
+    List<BusHandoverItems> getItemsListByMainSid(@Param("handoverSid") String handoverSid);
+
     /*IPage<BusHandoverItemsVo> selectPageVo(IPage<BusHandoverItems> page, @Param(Constants.WRAPPER) Wrapper<BusHandoverItems> qw);
 
     BusHandoverItemsVo fetchByHandoverSid(String handoverSid);*/

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoveritems/BusHandoverItemsMapper.xml

@@ -39,8 +39,18 @@
     </select>
 
     <select id="getListOne" resultType="com.yxt.anrui.buscenter.api.bushandoveritems.BusItemsListVo">
-        select vinNo,vinSid
+        select vinNo, vinSid
         from bus_handover_items
         where handoverSid = #{sid}
     </select>
+    <select id="getItemsList" resultType="com.yxt.anrui.buscenter.api.bushandoveritems.BusHandoverItems">
+        select *
+        from bus_handover_items
+    </select>
+    <select id="getItemsListByMainSid"
+            resultType="com.yxt.anrui.buscenter.api.bushandoveritems.BusHandoverItems">
+        select *
+        from bus_handover_items
+        where handoverSid = #{handoverSid}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoveritems/BusHandoverItemsRest.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.buscenter.biz.bushandoveritems;
 
+import com.yxt.anrui.buscenter.api.bushandoveritems.BusHandoverItems;
 import com.yxt.anrui.buscenter.api.bushandoveritems.BusHandoverItemsFeign;
 import com.yxt.anrui.buscenter.api.bushandoveritems.BusHandoverItemsQuery;
 import com.yxt.anrui.buscenter.api.bushandoveritems.BusHandoverItemsVo;
@@ -9,6 +10,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * Project: anrui-buscenter(业务中心) <br/>
  * File: BusHandoverItemsFeignFallback.java <br/>
@@ -35,6 +38,16 @@ public class BusHandoverItemsRest implements BusHandoverItemsFeign {
         return busHandoverItemsService.getDeliveryBill(query);
     }
 
+    @Override
+    public ResultBean<List<BusHandoverItems>> getItemsList() {
+        return busHandoverItemsService.getItemsList();
+    }
+
+    @Override
+    public ResultBean<List<BusHandoverItems>> getItemsListByMainSid(String handoverSid) {
+        return busHandoverItemsService.getItemsListByMainSid(handoverSid);
+    }
+
    /* @Override
     public ResultBean<PagerVo<BusHandoverItemsVo>> listPage(@RequestBody PagerQuery<BusHandoverItemsQuery> pq) {
         ResultBean rb = ResultBean.fireFail();

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoveritems/BusHandoverItemsService.java

@@ -78,6 +78,18 @@ public class BusHandoverItemsService extends MybatisBaseService<BusHandoverItems
         return baseMapper.getListOne(sid);
     }
 
+    public ResultBean<List<BusHandoverItems>> getItemsList() {
+        ResultBean rb = ResultBean.fireFail();
+        List<BusHandoverItems> list = baseMapper.getItemsList();
+        return rb.success().setData(list);
+    }
+
+    public ResultBean<List<BusHandoverItems>> getItemsListByMainSid(String handoverSid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<BusHandoverItems> list = baseMapper.getItemsListByMainSid(handoverSid);
+        return rb.success().setData(list);
+    }
+
    /* private QueryWrapper<BusHandoverItems> createQueryWrapper(BusHandoverItemsQuery query) {
         QueryWrapper<BusHandoverItems> qw = new QueryWrapper<>();
 

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

@@ -83,6 +83,7 @@ public interface BusHandoverPrepareVehicleMapper extends BaseMapper<BusHandoverP
 
     @Delete("delete from bus_handover_prepare_vehicle where mainSid = #{sid}")
     void deleteByMainSid(@Param("sid") String sid);
-
     List<BusHandoverPrepareVehicle> selectByApplySid(String sid);
+    @Select("select * from bus_handover_prepare_vehicle where vinSid = #{vinSid}")
+    BusHandoverPrepareVehicle fetchDetailsByVinSid(@Param("vinSid") String vinSid);
 }

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

@@ -90,4 +90,13 @@ public class BusHandoverPrepareVehicleRest implements BusHandoverPrepareVehicleF
 		BusHandoverPrepareVehicleDetailsVo vo = busHandoverPrepareVehicleService.fetchDetailsVoBySid(sid);
 		return rb.success().setData(vo);
 	}
+
+	@Override
+	@ApiOperation("根据车辆SID获取一条记录")
+	@GetMapping("/fetchDetailsByVinSid")
+	public ResultBean<BusHandoverPrepareVehicle> fetchDetailsByVinSid(String vinSid) {
+		ResultBean rb = ResultBean.fireFail();
+		BusHandoverPrepareVehicle entity = busHandoverPrepareVehicleService.fetchDetailsByVinSid(vinSid);
+		return rb.success().setData(entity);
+	}
 }

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

@@ -170,4 +170,9 @@ public class BusHandoverPrepareVehicleService extends MybatisBaseService<BusHand
     public List<BusHandoverPrepareVehicle> selectByApplySid(String sid) {
         return baseMapper.selectByApplySid(sid);
     }
+
+    public BusHandoverPrepareVehicle fetchDetailsByVinSid(String vinSid) {
+        BusHandoverPrepareVehicle entity = baseMapper.fetchDetailsByVinSid(vinSid);
+        return entity;
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWait;
+import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitListPageVo;
 import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitListVo;
 import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitVo;
 import org.apache.ibatis.annotations.Mapper;
@@ -24,4 +25,7 @@ public interface BusHandoverWaitMapper extends BaseMapper<BusHandoverWait> {
     List<BusHandoverWaitListVo> selectByNo(String contractNo);
 
     int deleteByVinSid(@Param("contractNo") String contractNo, @Param("vinSid") String vinSid);
+
+    IPage<BusHandoverWaitListPageVo> selectListPageVo(IPage<BusHandoverWait> page, @Param(Constants.WRAPPER) QueryWrapper<BusHandoverWait> qw);
 }
+

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitMapper.xml

@@ -3,18 +3,18 @@
 <mapper namespace="com.yxt.anrui.buscenter.biz.bushandoverwait.BusHandoverWaitMapper">
     <select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitVo">
         select bh.contractNo,
-               bh.customerName,
+        bh.customerName,
-               bh.payTypeValue
+        bh.payTypeValue
         from bus_handover_wait bh
         <where>
             ${ew.sqlSegment}
             <if test="name != null and name != ''">
                 and concat(IFNULL(bh.contractNo
-                  , '')
+                , '')
-                  , ifnull(bh.customerName
+                , ifnull(bh.customerName
-                  , '')) LIKE concat('%'
+                , '')) LIKE concat('%'
-                  , #{name}
+                , #{name}
-                  , '%')
+                , '%')
             </if>
         </where>
         group by bh.contractNo
@@ -26,6 +26,21 @@
         where contractNo = #{contractNo}
           and isDelete = 0
     </select>
+    <select id="selectListPageVo"
+            resultType="com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitListPageVo">
+        select
+        sid,
+        contractNo,
+        customerName,
+        payTypeValue,
+        payStateValue,
+        vinNo,
+        modelName
+        from bus_handover_wait
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
 
     <delete id="deleteByVinSid">
         update bus_handover_wait

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitRest.java

@@ -1,9 +1,6 @@
 package com.yxt.anrui.buscenter.biz.bushandoverwait;
 
-import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitDto;
+import com.yxt.anrui.buscenter.api.bushandoverwait.*;
-import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitFeign;
-import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitQuery;
-import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -26,6 +23,21 @@ public class BusHandoverWaitRest implements BusHandoverWaitFeign {
     private BusHandoverWaitService busHandoverWaitService;
 
 
+    /**
+     * PC代交车车辆列表
+     * @param pagerQuery
+     * @return
+     */
+    @Override
+    public ResultBean<PagerVo<BusHandoverWaitListPageVo>> listPage(PagerQuery<BusHandoverWaitListPageQuery> pagerQuery) {
+        return busHandoverWaitService.listPage(pagerQuery);
+    }
+
+    @Override
+    public ResultBean<String> saveOrUpdate(BusHandoverWaitDto dto) {
+        return busHandoverWaitService.saveOrUpdate(dto);
+    }
+
     @Override
     public ResultBean<PagerVo<BusHandoverWaitVo>> pagerList(PagerQuery<BusHandoverWaitQuery> pagerQuery) {
         ResultBean<PagerVo<BusHandoverWaitVo>> rb = ResultBean.fireFail();

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitService.java

@@ -3,9 +3,16 @@ package com.yxt.anrui.buscenter.biz.bushandoverwait;
 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.api.basevehicletempstate.BaseVehicleTempstate;
 import com.yxt.anrui.base.api.commoncontract.CommonContract;
 import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
+import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast;
+import com.yxt.anrui.buscenter.api.bushandoveritems.BusHandoverItems;
 import com.yxt.anrui.buscenter.api.bushandoverwait.*;
+import com.yxt.anrui.buscenter.api.busvehicleinformationhandover.BusVehicleInformationHandover;
+import com.yxt.anrui.buscenter.api.busvehicleinformationhandover.BusVehicleInformationHandoverQuery;
+import com.yxt.anrui.buscenter.api.busvehicleinformationhandover.BusVehicleInformationHandoverVo;
+import com.yxt.anrui.buscenter.biz.bushandoveritems.BusHandoverItemsService;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -18,6 +25,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Author dimengzhe
@@ -31,7 +39,8 @@ public class BusHandoverWaitService extends MybatisBaseService<BusHandoverWaitMa
     private SysStaffOrgFeign sysStaffOrgFeign;
     @Autowired
     private CommonContractFeign commonContractFeign;
-
+    @Autowired
+    private BusHandoverItemsService busHandoverItemsService;
     public PagerVo<BusHandoverWaitVo> pagerList(PagerQuery<BusHandoverWaitQuery> pagerQuery) {
         IPage<BusHandoverWait> page = PagerUtil.queryToPage(pagerQuery);
         BusHandoverWaitQuery params = pagerQuery.getParams();
@@ -76,4 +85,78 @@ public class BusHandoverWaitService extends MybatisBaseService<BusHandoverWaitMa
     public int deleteByVinSid(String contractNo, String vinSid) {
         return baseMapper.deleteByVinSid(contractNo, vinSid);
     }
+
+
+    /**
+     * 条件构造器
+     */
+    private QueryWrapper<BusHandoverWait> createQueryWrapper(BusHandoverWaitListPageQuery query) {
+        // todo: 这里根据具体业务调整查询条件
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<BusHandoverWait> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(query.getContractNo())) {
+            qw.like("contractNo", query.getContractNo());
+        }
+        if (StringUtils.isNotBlank(query.getVinNo())) {
+            qw.like("vinNo", query.getVinNo());
+        }
+        if (StringUtils.isNotBlank(query.getCustomerName())) {
+            qw.like("customerName", query.getCustomerName());
+        }
+        //查询已提交交车办理车辆
+        ResultBean<List<BusHandoverItems>> resultBean = busHandoverItemsService.getItemsList();
+        if (!resultBean.getData().isEmpty()) {
+            resultBean.getData().removeAll(Collections.singleton(null));
+            List<String> vinSidList = resultBean.getData().stream().map(v -> v.getVinSid()).collect(Collectors.toList());
+            vinSidList.removeAll(Collections.singleton(null));
+            if (!vinSidList.isEmpty()) {
+                qw.notIn("vinSid", vinSidList);
+            }
+        }
+        qw.eq("useOrgSid", query.getUseOrgSid());
+        qw.eq("isDelete", 0);
+        qw.orderByDesc("createTime");
+        return qw;
+    }
+
+
+    /**
+     * pc待交车车辆分页列表
+     *
+     * @param pq
+     * @return
+     */
+    public ResultBean<PagerVo<BusHandoverWaitListPageVo>> listPage(PagerQuery<BusHandoverWaitListPageQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        BusHandoverWaitListPageQuery query = pq.getParams();
+        QueryWrapper<BusHandoverWait> qw = createQueryWrapper(query);
+        IPage<BusHandoverWait> page = PagerUtil.queryToPage(pq);
+        IPage<BusHandoverWaitListPageVo> pagging = baseMapper.selectListPageVo(page, qw);
+        PagerVo<BusHandoverWaitListPageVo> p = PagerUtil.pageToVo(pagging, null);
+        return rb.success().setData(p);
+    }
+
+
+    /**
+     * 保存修改
+     *
+     * @param dto
+     * @return
+     */
+    public ResultBean<String> saveOrUpdate(BusHandoverWaitDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        String sid = "";
+        if (StringUtils.isNotBlank(dto.getSid())) {
+            BusHandoverWait entity = fetchBySid(dto.getSid());
+            BeanUtil.copyProperties(dto, entity, "id", "sid");
+            baseMapper.updateById(entity);
+            sid = dto.getSid();
+        } else {
+            BusHandoverWait entity = new BusHandoverWait();
+            BeanUtil.copyProperties(dto, entity, "id", "sid");
+            baseMapper.insert(entity);
+            sid = entity.getSid();
+        }
+        return rb.success().setData(sid);
+    }
 }

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

@@ -21,4 +21,6 @@ public interface BusVehicleInformationHandoverMapper extends BaseMapper<BusVehic
     BusVehicleInformationHandover selectByVehicleSid(@Param("vehicleSid") String vehicleSid);
 
     BusVehicleInformationHandover getVehicleInformationInfo(String sid);
+
+    BusVehicleInformationHandover detailsByVinSid(@Param("sid")String sid);
 }

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

@@ -40,4 +40,10 @@
             resultType="com.yxt.anrui.buscenter.api.busvehicleinformationhandover.BusVehicleInformationHandover">
         select * from bus_vehicle_information_handover where vehicleSid = #{sid}
     </select>
+    <select id="detailsByVinSid"
+            resultType="com.yxt.anrui.buscenter.api.busvehicleinformationhandover.BusVehicleInformationHandover">
+        select *
+        from bus_vehicle_information_handover
+        where vehicleSid = #{sid}
+    </select>
 </mapper>

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

@@ -66,4 +66,9 @@ public class BusVehicleInformationHandoverRest implements BusVehicleInformationH
         return busVehicleInformationHandoverService.details(sid);
     }
 
+    @Override
+    public ResultBean<BusVehicleInformationHandoverDetailsListVo> detailsByVinSid(String sid) {
+        return busVehicleInformationHandoverService.detailsByVinSid(sid);
+    }
+
 }

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

@@ -463,4 +463,25 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus
     public BusVehicleInformationHandover getVehicleInformationInfo(String sid) {
         return baseMapper.getVehicleInformationInfo(sid);
     }
+
+    public ResultBean<BusVehicleInformationHandoverDetailsListVo> detailsByVinSid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        BusVehicleInformationHandoverDetailsListVo vo = new BusVehicleInformationHandoverDetailsListVo();
+        BusVehicleInformationHandover entity = baseMapper.detailsByVinSid(sid);
+        if (null != entity) {
+            BeanUtil.copyProperties(entity, vo);
+        }
+        List<BusVehicleInformationVo> voList = new ArrayList<>();
+        List<BusVehicleInformation> informations = busVehicleInformationService.getByHandoverSid(entity.getSid());
+        if (null != informations && informations.size() > 0) {
+            for (BusVehicleInformation information : informations) {
+                BusVehicleInformationVo informationVo = new BusVehicleInformationVo();
+                BeanUtil.copyProperties(information, informationVo);
+                informationVo.setInformationSid(information.getSid());
+                voList.add(informationVo);
+            }
+        }
+        vo.setInformations(voList);
+        return rb.success().setData(vo);
+    }
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeign.java

@@ -94,4 +94,8 @@ public interface FinVehicleInvoiceFeign {
     @ResponseBody
     ResultBean invoiceYJ(@RequestBody FinVehicleInvoicePushTransferDto dto);
 
+    @ApiOperation("根据合同号获取发票信息")
+    @PostMapping("/selectByContractNo")
+    @ResponseBody
+    ResultBean<List<FinVehicleInvoice>> selectByContractNo(@RequestParam("contractNo")String contractNo);
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeignFallback.java

@@ -104,4 +104,9 @@ public class FinVehicleInvoiceFeignFallback implements FinVehicleInvoiceFeign {
 		return null;
 	}
 
+	@Override
+	public ResultBean<List<FinVehicleInvoice>> selectByContractNo(String contractNo) {
+		return null;
+	}
+
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java

@@ -55,5 +55,7 @@ public interface FinVehicleInvoiceMapper extends BaseMapper<FinVehicleInvoice> {
 
     VehicleInvoiceVo selectByVinSids(String vinSid);
 
+    List<FinVehicleInvoice> selectByContractNo(String contractNo);
+
     FinVehicleInvoice selectByVinSidss(String vinSid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml

@@ -225,4 +225,9 @@
     <select id="selectByVinSidss" resultType="com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoice">
         select * from fin_vehicle_invoice where vehicleSid = #{vinSid} order by id desc limit 1
     </select>
+    <select id="selectByContractNo" resultType="com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoice">
+        select *
+        from fin_vehicle_invoice
+        where contractNo = #{contractNo}
+    </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java

@@ -222,4 +222,9 @@ public class FinVehicleInvoiceRest implements FinVehicleInvoiceFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<List<FinVehicleInvoice>> selectByContractNo(String contractNo) {
+        return finVehicleInvoiceService.selectByContractNo(contractNo);
+    }
+
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java

@@ -387,4 +387,10 @@ public class FinVehicleInvoiceService extends MybatisBaseService<FinVehicleInvoi
         FinVehicleInvoice finVehicleInvoice = baseMapper.selectByVinSidss(vinSid);
         return rb.success().setData(finVehicleInvoice);
     }
+
+    public ResultBean<List<FinVehicleInvoice>> selectByContractNo(String contractNo) {
+        ResultBean<List<FinVehicleInvoice>> rb = ResultBean.fireFail();
+        List<FinVehicleInvoice> finVehicleInvoices = baseMapper.selectByContractNo(contractNo);
+        return rb.success().setData(finVehicleInvoices);
+    }
 }