Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java

@@ -215,7 +215,7 @@ public interface BaseVehicleFeign {
      */
     @ApiOperation("虚拟订单选择车辆根据车辆sid查询信息")
     @GetMapping("/getBusDepositVehByVehSid/{vehicleSid}")
-    public ResultBean<BusDepositVehListVo> getBusDepositVehByVehSid(@PathVariable("vehicleSid") String vehicleSid);
+    public ResultBean<BusDepositVinListVo> getBusDepositVehByVehSid(@PathVariable("vehicleSid") String vehicleSid);
 
     @ApiOperation("是否允许买断")
     @GetMapping("/isBuyoutAllowed/{vehicleSid}")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java

@@ -117,7 +117,7 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
     }
 
     @Override
-    public ResultBean<BusDepositVehListVo> getBusDepositVehByVehSid(String vehicleSid) {
+    public ResultBean<BusDepositVinListVo> getBusDepositVehByVehSid(String vehicleSid) {
         return null;
     }
 

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BusDepositVehListVo.java → anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BusDepositVinListVo.java

@@ -13,7 +13,7 @@ import lombok.Data;
  */
 @ApiModel("销售虚拟订单预定车辆列表")
 @Data
-public class BusDepositVehListVo implements Vo {
+public class BusDepositVinListVo implements Vo {
 
     @ApiModelProperty("品牌")
     private String brandName;
@@ -29,4 +29,7 @@ public class BusDepositVehListVo implements Vo {
 
     @ApiModelProperty("销售指导价（万元）")
     private String guidedPrice;
+
+    @ApiModelProperty("锁定状态")
+    private String lockedState;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java

@@ -9,7 +9,6 @@ import com.yxt.anrui.base.api.basevehicle.*;
 import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo;
 import com.yxt.anrui.base.api.basevehicle.app.InputVinListVo;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageQuery;
-import com.yxt.common.core.result.ResultBean;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
@@ -198,7 +197,7 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
      */
     ExiCarConfigDetailVo selectExiCarConfig(@Param("modelSid") String modelSid, @Param("configSid") String configSid);
 
-    BusDepositVehListVo getBusDepositVehByVehSid(@Param("sid") String sid);
+    BusDepositVinListVo getBusDepositVehByVehSid(@Param("sid") String sid);
 
     /**
      * 获取车架号

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

@@ -563,10 +563,11 @@
         WHERE bvc.sid = #{vehModelConfigSid} LIMIT 1
     </select>
 
-    <select id="getBusDepositVehByVehSid" resultType="com.yxt.anrui.base.api.basevehicle.BusDepositVehListVo">
+    <select id="getBusDepositVehByVehSid" resultType="com.yxt.anrui.base.api.basevehicle.BusDepositVinListVo">
         SELECT bv.sid,
         <!--车辆状态-->
         bv.vehicleStateValue,
+        bv.lockedState,
         <!--品牌名称-->
         bvm.brandName,
         <!--车型名称-->

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java

@@ -679,7 +679,7 @@ public class BaseVehicleRest implements BaseVehicleFeign {
     }
 
     @Override
-    public ResultBean<BusDepositVehListVo> getBusDepositVehByVehSid(String vehicleSid) {
+    public ResultBean<BusDepositVinListVo> getBusDepositVehByVehSid(String vehicleSid) {
         return baseVehicleService.getBusDepositVehByVehSid(vehicleSid);
     }
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -989,8 +989,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
      * @param vehicleSid
      * @return
      */
-    public ResultBean<BusDepositVehListVo> getBusDepositVehByVehSid(String vehicleSid) {
-        return new ResultBean<BusDepositVehListVo>().success().setData(baseMapper.getBusDepositVehByVehSid(vehicleSid));
+    public ResultBean<BusDepositVinListVo> getBusDepositVehByVehSid(String vehicleSid) {
+        return new ResultBean<BusDepositVinListVo>().success().setData(baseMapper.getBusDepositVehByVehSid(vehicleSid));
     }
 
     /**

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@@ -1111,7 +1111,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                 } else {
                     vo.setIdCardArchives(false);
                     if (StringUtils.isNotBlank(vo.getIdImagesUrl())) {
-                        String[] split3 = vo.getSceneSignUrl().split(",");
+                        String[] split3 = vo.getIdImagesUrl().split(",");
                         List<String> idCard = new ArrayList<>();
                         List<String> idCardImages = Arrays.asList(split3);
                         for (String idCardImage : idCardImages) {

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AdCarListVo.java

@@ -7,6 +7,9 @@ import lombok.Data;
 @Data
 public class AdCarListVo implements Vo {
     private static final long serialVersionUID = -1495695891564098295L;
+
+    @ApiModelProperty("车辆sid")
+    private String carSid;
     @ApiModelProperty("车架号")
     private String vin;
     @ApiModelProperty("成交价")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppAdvanceArrearsInfoQuery.java

@@ -10,4 +10,7 @@ public class AppAdvanceArrearsInfoQuery implements Query {
 
     @ApiModelProperty("申请sid")
     private String contractSid;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryInfoVo.java

@@ -39,7 +39,15 @@ public class AppArrearsCarryInfoVo implements Vo {
     private List<AdCarListVo> vinList = new ArrayList<>();
     @ApiModelProperty("流程实列id")
     private String procInsId;
-    @ApiModelProperty("用户sid")
+    @ApiModelProperty("任务id")
     private String taskId;
+    @ApiModelProperty("流程实例id")
+    private String procInstId;
+    @ApiModelProperty("流程定义id")
+    private String procDefId;
+    @ApiModelProperty("节点状态")
+    private String nodeState;
+    @ApiModelProperty("节点id")
+    private String nodeId;
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/GetNodeQuery.java

@@ -1,11 +1,19 @@
 package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable;
 
 import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+
 @Data
 public class GetNodeQuery implements Query {
     private static final long serialVersionUID = -6541874437751241596L;
 
+    @ApiModelProperty(value = "环节定义id")
+    @NotBlank(message = "参数错误：taskDefKey")
+    private String taskDefKey;
 
+//    @ApiModelProperty(value = "分支字段及业务字段")
+//    private Map<String, Object> formVariables;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepare.java

@@ -0,0 +1,80 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.bushandoverprepare;
+
+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;
+
+/**
+ * Project: bus_handover(交车准备) <br/>
+ * File: BusHandoverPrepare.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.bushandoverprepare.BusHandoverPrepare <br/>
+ * Description: 交车准备-申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-09 15:44:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "交车准备-申请表", description = "交车准备-申请表")
+@TableName("bus_handover_prepare")
+public class BusHandoverPrepare extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+	@ApiModelProperty("联系电话")
+    private String mobile; // 联系电话
+	@ApiModelProperty("品牌")
+    private String brandName; // 品牌
+	@ApiModelProperty("车辆数量")
+    private String num; // 车辆数量
+	@ApiModelProperty("付款方式key")
+    private String payTypeKey; // 付款方式key
+	@ApiModelProperty("付款方式value")
+    private String payType; // 付款方式value
+	@ApiModelProperty("交车准备状态key")
+    private String handoverPrepareStateKey; // 交车准备状态key
+	@ApiModelProperty("交车准备状态value")
+    private String handoverPrepareState; // 交车准备状态value
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareAddDto.java

@@ -0,0 +1,43 @@
+package com.yxt.anrui.buscenter.api.bushandoverprepare;
+
+import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.AppBusHandoverPrepareVehicleDto;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class BusHandoverPrepareAddDto implements Dto {
+    private static final long serialVersionUID = -5503119838818185683L;
+
+    @ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+    @ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+    @ApiModelProperty("联系电话")
+    private String mobile; // 联系电话
+    @ApiModelProperty("品牌")
+    private String brandName; // 品牌
+    @ApiModelProperty("车辆数量")
+    private String num; //  车辆数量
+    @ApiModelProperty("付款方式key")
+    private String payTypeKey; // 付款方式key
+    @ApiModelProperty("付款方式value")
+    private String payType; // 付款方式value
+    @ApiModelProperty("交车准备状态key")
+    private String handoverPrepareStateKey; // 交车准备状态key
+    @ApiModelProperty("交车准备状态value")
+    private String handoverPrepareState; // 交车准备状态value
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+    @ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+    @ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+    @ApiModelProperty("车辆信息")
+    private List<AppBusHandoverPrepareVehicleDto> appBusHandoverPrepareVehicleDtos;
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareDetailsVo.java

@@ -0,0 +1,81 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.bushandoverprepare;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: bus_handover(交车准备) <br/>
+ * File: BusHandoverPrepareVo.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.bushandoverprepare.BusHandoverPrepareVo <br/>
+ * Description: 交车准备-申请表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-09 15:44:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "交车准备-申请表 视图数据详情", description = "交车准备-申请表 视图数据详情")
+public class BusHandoverPrepareDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+	@ApiModelProperty("联系电话")
+    private String mobile; // 联系电话
+	@ApiModelProperty("品牌")
+    private String brandName; // 品牌
+	@ApiModelProperty("车辆数量")
+    private String num; // 车辆数量
+	@ApiModelProperty("付款方式key")
+    private String payTypeKey; // 付款方式key
+	@ApiModelProperty("付款方式value")
+    private String payType; // 付款方式value
+	@ApiModelProperty("交车准备状态key")
+    private String handoverPrepareStateKey; // 交车准备状态key
+	@ApiModelProperty("交车准备状态value")
+    private String handoverPrepareState; // 交车准备状态value
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareDto.java

@@ -0,0 +1,81 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.bushandoverprepare;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: bus_handover(交车准备) <br/>
+ * File: BusHandoverPrepareDto.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.bushandoverprepare.BusHandoverPrepareDto <br/>
+ * Description: 交车准备-申请表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-09 15:44:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "交车准备-申请表 数据传输对象", description = "交车准备-申请表 数据传输对象")
+public class BusHandoverPrepareDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+	@ApiModelProperty("联系电话")
+    private String mobile; // 联系电话
+	@ApiModelProperty("品牌")
+    private String brandName; // 品牌
+	@ApiModelProperty("车辆数量")
+    private String num; // 车辆数量
+	@ApiModelProperty("付款方式key")
+    private String payTypeKey; // 付款方式key
+	@ApiModelProperty("付款方式value")
+    private String payType; // 付款方式value
+	@ApiModelProperty("交车准备状态key")
+    private String handoverPrepareStateKey; // 交车准备状态key
+	@ApiModelProperty("交车准备状态value")
+    private String handoverPrepareState; // 交车准备状态value
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareFeign.java

@@ -0,0 +1,144 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.bushandoverprepare;
+
+import com.yxt.anrui.buscenter.api.bushandoverprepare.app.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * Project: bus_handover(交车准备) <br/>
+ * File: BusHandoverPrepareFeign.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.bushandoverprepare.BusHandoverPrepareFeign <br/>
+ * Description: 交车准备-申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-09 15:44:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "交车准备-申请表")
+@FeignClient(
+        contextId = "anrui-buscenter-handover-BusHandoverPrepare",
+        name = "anrui-buscenter",
+        path = "v1/bushandoverprepare",
+        fallback = BusHandoverPrepareFeignFallback.class)
+public interface BusHandoverPrepareFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<BusHandoverPrepareVo>> listPage(@RequestBody PagerQuery<BusHandoverPrepareQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody BusHandoverPrepareDto dto);
+
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<BusHandoverPrepareDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("出库申请推送交车准备数据")
+    @PostMapping("/addHandoverPrepare")
+    @ResponseBody
+    public ResultBean addHandoverPrepare(@RequestBody BusHandoverPrepareAddDto dto);
+
+
+    //***********************************App**********************************
+
+
+    @ApiOperation("手机端-获取交车准备申请列表")
+    @PostMapping("/getDeliveryPlanList")
+    @ResponseBody
+    ResultBean<PagerVo<AppHandoverPreparePageVo>> getDeliveryPlanList(@RequestBody PagerQuery<AppHandoverPreparePageQuery> pagerQuery);
+
+    @ApiOperation("手机端-初始化交车准备申请")
+    @PostMapping("/getDeliveryPlanInfo")
+    @ResponseBody
+    ResultBean<AppBusHandoverPrepareInfoVo> getDeliveryPlanInfo(@SpringQueryMap AppBusHandoverPrepareInfoQuery query);
+
+    @ApiOperation("修改交车准备 各资料状态修改")
+    @PutMapping("/saveState")
+    @ResponseBody
+    ResultBean saveState(@RequestBody AppStateDateDto dto);
+
+    @ApiOperation("获取交车准备 发票信息")
+    @GetMapping("/getInvoiceInfo")
+    @ResponseBody
+    ResultBean<AppInvoicingInfoVo> getInvoiceInfo(@SpringQueryMap AppInvoicingInfoQuery query);
+
+    @ApiOperation("获取交车准备 合格证信息")
+    @GetMapping("/getCertificateInfo")
+    @ResponseBody
+    ResultBean<AppCertificateInfoVo> getCertificateInfo(@SpringQueryMap AppCertificateInfoQuery query);
+
+    @ApiOperation("获取交车准备 保单信息")
+    @GetMapping("/getPolicyInfo")
+    @ResponseBody
+    ResultBean<AppPolicyInfoVo> getPolicyInfo(@SpringQueryMap AppPolicyInfoQuery query);
+
+    @ApiOperation("修改交车准备 保单信息")
+    @PutMapping("/savePolicyInfo")
+    @ResponseBody
+    ResultBean savePolicyInfo(@RequestBody AppPolicyDto dto);
+
+    @ApiOperation("获取交车准备 其他资料信息")
+    @GetMapping("/getOtherDataInfo")
+    @ResponseBody
+    ResultBean<AppOtherDataInfoVo> getOtherDataInfo(@SpringQueryMap AppOtherDataInfoQuery query);
+
+    @ApiOperation("修改交车准备 其他资料信息")
+    @PutMapping("/saveOtherDataInfo")
+    @ResponseBody
+    ResultBean saveOtherDataInfo(@RequestBody AppOtherDataDto dto);
+
+    @ApiOperation("保存交车准备信息")
+    @PostMapping("/saveDeliveryPlanInfo")
+    @ResponseBody
+    ResultBean saveDeliveryPlanInfo(@RequestBody AppHandoverPrepareDto dto);
+
+    @ApiOperation("交车准备详情")
+    @GetMapping("/getDeliveryPlanInfoDetail")
+    @ResponseBody
+    ResultBean<AppBusHandoverPrepareInfoVo> getDeliveryPlanInfoDetail(@SpringQueryMap AppBusHandoverPrepareInfoQuery query);
+
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareFeignFallback.java

@@ -0,0 +1,131 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.bushandoverprepare;
+
+import com.yxt.anrui.buscenter.api.bushandoverprepare.app.*;
+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;
+
+/**
+ * Project: bus_handover(交车准备) <br/>
+ * File: BusHandoverPrepareFeignFallback.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.bushandoverprepare.BusHandoverPrepareFeignFallback <br/>
+ * Description: 交车准备-申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-09 15:44:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class BusHandoverPrepareFeignFallback implements BusHandoverPrepareFeign {
+
+	@Override
+	public ResultBean<PagerVo<BusHandoverPrepareVo>> listPage(PagerQuery<BusHandoverPrepareQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口bus_handover/bushandoverprepare/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(BusHandoverPrepareDto dto){
+		return ResultBean.fireFail().setMsg("接口bus_handover/bushandoverprepare/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口bus_handover/bushandoverprepare/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<BusHandoverPrepareDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口bus_handover/bushandoverprepare/fetchDetailsBySid无法访问");
+	}
+
+	@Override
+	public ResultBean addHandoverPrepare(BusHandoverPrepareAddDto dto) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<PagerVo<AppHandoverPreparePageVo>> getDeliveryPlanList(PagerQuery<AppHandoverPreparePageQuery> pagerQuery) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<AppBusHandoverPrepareInfoVo> getDeliveryPlanInfo(AppBusHandoverPrepareInfoQuery query) {
+		return null;
+	}
+
+	@Override
+	public ResultBean saveState(AppStateDateDto dto) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<AppInvoicingInfoVo> getInvoiceInfo(AppInvoicingInfoQuery query) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<AppCertificateInfoVo> getCertificateInfo(AppCertificateInfoQuery query) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<AppPolicyInfoVo> getPolicyInfo(AppPolicyInfoQuery query) {
+		return null;
+	}
+
+	@Override
+	public ResultBean savePolicyInfo(AppPolicyDto dto) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<AppOtherDataInfoVo> getOtherDataInfo(AppOtherDataInfoQuery query) {
+		return null;
+	}
+
+	@Override
+	public ResultBean saveOtherDataInfo(AppOtherDataDto dto) {
+		return null;
+	}
+
+	@Override
+	public ResultBean saveDeliveryPlanInfo(AppHandoverPrepareDto dto) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<AppBusHandoverPrepareInfoVo> getDeliveryPlanInfoDetail(AppBusHandoverPrepareInfoQuery query) {
+		return null;
+	}
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareQuery.java

@@ -0,0 +1,79 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.bushandoverprepare;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: bus_handover(交车准备) <br/>
+ * File: BusHandoverPrepareQuery.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.bushandoverprepare.BusHandoverPrepareQuery <br/>
+ * Description: 交车准备-申请表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-09 15:44:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "交车准备-申请表 查询条件", description = "交车准备-申请表 查询条件")
+public class BusHandoverPrepareQuery implements Query {
+
+	@ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+	@ApiModelProperty("联系电话")
+    private String mobile; // 联系电话
+	@ApiModelProperty("品牌")
+    private String brandName; // 品牌
+	@ApiModelProperty("车辆数量")
+    private String num; // 车辆数量
+	@ApiModelProperty("付款方式key")
+    private String payTypeKey; // 付款方式key
+	@ApiModelProperty("付款方式value")
+    private String payType; // 付款方式value
+	@ApiModelProperty("交车准备状态key")
+    private String handoverPrepareStateKey; // 交车准备状态key
+	@ApiModelProperty("交车准备状态value")
+    private String handoverPrepareState; // 交车准备状态value
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareVo.java

@@ -0,0 +1,81 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.bushandoverprepare;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: bus_handover(交车准备) <br/>
+ * File: BusHandoverPrepareVo.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.bushandoverprepare.BusHandoverPrepareVo <br/>
+ * Description: 交车准备-申请表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-09 15:44:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "交车准备-申请表 视图数据对象", description = "交车准备-申请表 视图数据对象")
+public class BusHandoverPrepareVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+	@ApiModelProperty("联系电话")
+    private String mobile; // 联系电话
+	@ApiModelProperty("品牌")
+    private String brandName; // 品牌
+	@ApiModelProperty("车辆数量")
+    private String num; // 车辆数量
+	@ApiModelProperty("付款方式key")
+    private String payTypeKey; // 付款方式key
+	@ApiModelProperty("付款方式value")
+    private String payType; // 付款方式value
+	@ApiModelProperty("交车准备状态key")
+    private String handoverPrepareStateKey; // 交车准备状态key
+	@ApiModelProperty("交车准备状态value")
+    private String handoverPrepareState; // 交车准备状态value
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppBusHandoverPrepareInfoQuery.java

@@ -0,0 +1,16 @@
+package com.yxt.anrui.buscenter.api.bushandoverprepare.app;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppBusHandoverPrepareInfoQuery implements Query {
+    private static final long serialVersionUID = -8642412443149902560L;
+
+    @ApiModelProperty("sid")
+    private String sid;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppBusHandoverPrepareInfoVo.java

@@ -0,0 +1,47 @@
+package com.yxt.anrui.buscenter.api.bushandoverprepare.app;
+
+import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.AppBusHandoverPrepareVehicleInfoVo;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AppBusHandoverPrepareInfoVo implements Vo {
+    private static final long serialVersionUID = -4080169340603665916L;
+
+    private String sid; // sid
+
+    @ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+    @ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+    @ApiModelProperty("联系电话")
+    private String mobile; // 联系电话
+    @ApiModelProperty("品牌")
+    private String brandName; // 品牌
+    @ApiModelProperty("车辆数量")
+    private String num; // 车辆数量
+    @ApiModelProperty("付款方式key")
+    private String payTypeKey; // 付款方式key
+    @ApiModelProperty("付款方式value")
+    private String payType; // 付款方式value
+    @ApiModelProperty("交车准备状态key")
+    private String handoverPrepareStateKey; // 交车准备状态key
+    @ApiModelProperty("交车准备状态value")
+    private String handoverPrepareState; // 交车准备状态value
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+    @ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+    @ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+    @ApiModelProperty("用户sid")
+    private String userSid; // 用户sid
+
+    @ApiModelProperty("车辆列表")
+    private List<AppBusHandoverPrepareVehicleInfoVo> carDataList;
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppCertificateInfoQuery.java

@@ -0,0 +1,4 @@
+package com.yxt.anrui.buscenter.api.bushandoverprepare.app;
+
+public class AppCertificateInfoQuery {
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppCertificateInfoVo.java

@@ -0,0 +1,4 @@
+package com.yxt.anrui.buscenter.api.bushandoverprepare.app;
+
+public class AppCertificateInfoVo {
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppHandoverPrepareDto.java

@@ -0,0 +1,11 @@
+package com.yxt.anrui.buscenter.api.bushandoverprepare.app;
+
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+@Data
+public class AppHandoverPrepareDto implements Dto {
+    private static final long serialVersionUID = -3500405140044756010L;
+
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppHandoverPreparePageQuery.java

@@ -0,0 +1,20 @@
+package com.yxt.anrui.buscenter.api.bushandoverprepare.app;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppHandoverPreparePageQuery implements Query {
+    private static final long serialVersionUID = 9181406369906863485L;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+    @ApiModelProperty("")
+    private String name;
+
+    @ApiModelProperty("")
+    private String type;
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppHandoverPreparePageVo.java

@@ -0,0 +1,45 @@
+package com.yxt.anrui.buscenter.api.bushandoverprepare.app;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppHandoverPreparePageVo implements Vo {
+    private static final long serialVersionUID = -7176749864266340577L;
+
+    @ApiModelProperty("sid")
+    private String sid;
+
+    @ApiModelProperty("客户名称")
+    private String customerName;
+
+    @ApiModelProperty("联系电话")
+    private String mobile;
+
+    @ApiModelProperty("合同编号")
+    private String contractNo;
+
+    @ApiModelProperty("合同sid")
+    private String contractSid;
+
+    @ApiModelProperty("车型")
+    private String model;
+
+    @ApiModelProperty("付款方式")
+    private String payType;
+
+    @ApiModelProperty("数量")
+    private String num;
+
+    @ApiModelProperty("交车准备状态")
+    private String handoverPrepareState;
+
+    @ApiModelProperty("交车准备状态key")
+    private String handoverPrepareStateKey;
+
+    @ApiModelProperty("是否显示办理")
+    private Boolean isShowUpData;
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppInvoicingInfoQuery.java

@@ -0,0 +1,17 @@
+package com.yxt.anrui.buscenter.api.bushandoverprepare.app;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppInvoicingInfoQuery implements Query {
+    private static final long serialVersionUID = 235552231378193054L;
+
+    @ApiModelProperty("车架号")
+    private String vin;
+
+    @ApiModelProperty("车辆sid")
+    private String carSid;
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppInvoicingInfoVo.java

@@ -0,0 +1,24 @@
+package com.yxt.anrui.buscenter.api.bushandoverprepare.app;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AppInvoicingInfoVo implements Vo {
+    private static final long serialVersionUID = 8827030575604891015L;
+
+    @ApiModelProperty("车架号")
+    private String vin;
+    @ApiModelProperty("车辆sid")
+    private String carSid;
+    @ApiModelProperty("发票代码")
+    private String invoice;
+    @ApiModelProperty("开票日期")
+    private String date;
+    @ApiModelProperty("开票附件")
+    private List<String> invoiceImages;
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppOtherDataDto.java

@@ -0,0 +1,4 @@
+package com.yxt.anrui.buscenter.api.bushandoverprepare.app;
+
+public class AppOtherDataDto {
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppOtherDataInfoQuery.java

@@ -0,0 +1,4 @@
+package com.yxt.anrui.buscenter.api.bushandoverprepare.app;
+
+public class AppOtherDataInfoQuery {
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppOtherDataInfoVo.java

@@ -0,0 +1,4 @@
+package com.yxt.anrui.buscenter.api.bushandoverprepare.app;
+
+public class AppOtherDataInfoVo {
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppPolicyDto.java

@@ -0,0 +1,11 @@
+package com.yxt.anrui.buscenter.api.bushandoverprepare.app;
+
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+@Data
+public class AppPolicyDto implements Dto {
+    private static final long serialVersionUID = 214089296630394804L;
+
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppPolicyInfoQuery.java

@@ -0,0 +1,4 @@
+package com.yxt.anrui.buscenter.api.bushandoverprepare.app;
+
+public class AppPolicyInfoQuery {
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppPolicyInfoVo.java

@@ -0,0 +1,4 @@
+package com.yxt.anrui.buscenter.api.bushandoverprepare.app;
+
+public class AppPolicyInfoVo {
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppStateDateDto.java

@@ -0,0 +1,17 @@
+package com.yxt.anrui.buscenter.api.bushandoverprepare.app;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppStateDateDto implements Dto {
+    private static final long serialVersionUID = -3523087314399529059L;
+
+    @ApiModelProperty("sid")
+    private String sid;
+    @ApiModelProperty("车架号")
+    private String vin;
+    @ApiModelProperty("状态")
+    private String key;
+}

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

@@ -0,0 +1,33 @@
+package com.yxt.anrui.buscenter.api.bushandoverpreparevehicle;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppBusHandoverPrepareVehicleDto implements Dto {
+    private static final long serialVersionUID = -8913800891100928726L;
+
+    @ApiModelProperty("交车申请表sid")
+    private String mainSid; // 交车申请表sid
+    @ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+    @ApiModelProperty("开票状态")
+    private int invoicingState; // 开票状态
+    @ApiModelProperty("合格证状态")
+    private int certificateState; // 合格证状态
+    @ApiModelProperty("保单状态")
+    private int policyState; // 保单状态
+    @ApiModelProperty("随车资料状态")
+    private int onBoardDataState; // 随车资料状态
+    @ApiModelProperty("其他资料状态")
+    private int otherDataState; // 其他资料状态
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+    @ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+    @ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+}

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

@@ -0,0 +1,35 @@
+package com.yxt.anrui.buscenter.api.bushandoverpreparevehicle;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppBusHandoverPrepareVehicleInfoVo implements Vo {
+    private static final long serialVersionUID = 1415137296013613928L;
+
+    @ApiModelProperty("交车申请表sid")
+    private String mainSid; // 交车申请表sid
+    @ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+    @ApiModelProperty("开票状态")
+    private int invoicingState; // 开票状态
+    @ApiModelProperty("合格证状态")
+    private int certificateState; // 合格证状态
+    @ApiModelProperty("保单状态")
+    private int policyState; // 保单状态
+    @ApiModelProperty("随车资料状态")
+    private int onBoardDataState; // 随车资料状态
+    @ApiModelProperty("其他资料状态")
+    private int otherDataState; // 其他资料状态
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+    @ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+    @ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+
+
+}

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

@@ -0,0 +1,76 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.bushandoverpreparevehicle;
+
+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;
+
+/**
+ * Project: bus_handover(交车准备) <br/>
+ * File: BusHandoverPrepareVehicle.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicle <br/>
+ * Description: 交车准备-申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-09 15:44:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "交车准备-申请表", description = "交车准备-申请表")
+@TableName("bus_handover_prepare_vehicle")
+public class BusHandoverPrepareVehicle extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("交车申请表sid")
+    private String mainSid; // 交车申请表sid
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("开票状态")
+    private int invoicingState; // 开票状态
+	@ApiModelProperty("合格证状态")
+    private int certificateState; // 合格证状态
+	@ApiModelProperty("保单状态")
+    private int policyState; // 保单状态
+	@ApiModelProperty("随车资料状态")
+    private int onBoardDataState; // 随车资料状态
+	@ApiModelProperty("其他资料状态")
+    private int otherDataState; // 其他资料状态
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+
+}

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

@@ -0,0 +1,77 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.bushandoverpreparevehicle;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: bus_handover(交车准备) <br/>
+ * File: BusHandoverPrepareVehicleVo.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicleVo <br/>
+ * Description: 交车准备-申请表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-09 15:44:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "交车准备-申请表 视图数据详情", description = "交车准备-申请表 视图数据详情")
+public class BusHandoverPrepareVehicleDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("交车申请表sid")
+    private String mainSid; // 交车申请表sid
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+    @ApiModelProperty("开票状态")
+    private int invoicingState; // 开票状态
+    @ApiModelProperty("合格证状态")
+    private int certificateState; // 合格证状态
+    @ApiModelProperty("保单状态")
+    private int policyState; // 保单状态
+    @ApiModelProperty("随车资料状态")
+    private int onBoardDataState; // 随车资料状态
+    @ApiModelProperty("其他资料状态")
+    private int otherDataState; // 其他资料状态
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+
+}

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

@@ -0,0 +1,77 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.bushandoverpreparevehicle;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: bus_handover(交车准备) <br/>
+ * File: BusHandoverPrepareVehicleDto.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicleDto <br/>
+ * Description: 交车准备-申请表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-09 15:44:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "交车准备-申请表 数据传输对象", description = "交车准备-申请表 数据传输对象")
+public class BusHandoverPrepareVehicleDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("交车申请表sid")
+    private String mainSid; // 交车申请表sid
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+    @ApiModelProperty("开票状态")
+    private int invoicingState; // 开票状态
+    @ApiModelProperty("合格证状态")
+    private int certificateState; // 合格证状态
+    @ApiModelProperty("保单状态")
+    private int policyState; // 保单状态
+    @ApiModelProperty("随车资料状态")
+    private int onBoardDataState; // 随车资料状态
+    @ApiModelProperty("其他资料状态")
+    private int otherDataState; // 其他资料状态
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+
+}

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

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.bushandoverpreparevehicle;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: bus_handover(交车准备) <br/>
+ * File: BusHandoverPrepareVehicleFeign.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicleFeign <br/>
+ * Description: 交车准备-申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-09 15:44:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "交车准备-申请表")
+@FeignClient(
+        contextId = "anrui-buscenter-handover-BusHandoverPrepareVehicle",
+        name = "anrui-buscenter",
+        path = "v1/bushandoverpreparevehicle",
+        fallback = BusHandoverPrepareVehicleFeignFallback.class)
+public interface BusHandoverPrepareVehicleFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<BusHandoverPrepareVehicleVo>> listPage(@RequestBody PagerQuery<BusHandoverPrepareVehicleQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody BusHandoverPrepareVehicleDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<BusHandoverPrepareVehicleDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

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

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.bushandoverpreparevehicle;
+
+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;
+
+import java.util.List;
+
+/**
+ * Project: bus_handover(交车准备) <br/>
+ * File: BusHandoverPrepareVehicleFeignFallback.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicleFeignFallback <br/>
+ * Description: 交车准备-申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-09 15:44:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class BusHandoverPrepareVehicleFeignFallback implements BusHandoverPrepareVehicleFeign {
+
+	@Override
+	public ResultBean<PagerVo<BusHandoverPrepareVehicleVo>> listPage(PagerQuery<BusHandoverPrepareVehicleQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口bus_handover/bushandoverpreparevehicle/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(BusHandoverPrepareVehicleDto dto){
+		return ResultBean.fireFail().setMsg("接口bus_handover/bushandoverpreparevehicle/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口bus_handover/bushandoverpreparevehicle/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<BusHandoverPrepareVehicleDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口bus_handover/bushandoverpreparevehicle/fetchDetailsBySid无法访问");
+	}
+}

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

@@ -0,0 +1,75 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.bushandoverpreparevehicle;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: bus_handover(交车准备) <br/>
+ * File: BusHandoverPrepareVehicleQuery.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicleQuery <br/>
+ * Description: 交车准备-申请表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-09 15:44:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "交车准备-申请表 查询条件", description = "交车准备-申请表 查询条件")
+public class BusHandoverPrepareVehicleQuery implements Query {
+
+	@ApiModelProperty("交车申请表sid")
+    private String mainSid; // 交车申请表sid
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+    @ApiModelProperty("开票状态")
+    private int invoicingState; // 开票状态
+    @ApiModelProperty("合格证状态")
+    private int certificateState; // 合格证状态
+    @ApiModelProperty("保单状态")
+    private int policyState; // 保单状态
+    @ApiModelProperty("随车资料状态")
+    private int onBoardDataState; // 随车资料状态
+    @ApiModelProperty("其他资料状态")
+    private int otherDataState; // 其他资料状态
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+
+}

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

@@ -0,0 +1,77 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.bushandoverpreparevehicle;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: bus_handover(交车准备) <br/>
+ * File: BusHandoverPrepareVehicleVo.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicleVo <br/>
+ * Description: 交车准备-申请表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-09 15:44:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "交车准备-申请表 视图数据对象", description = "交车准备-申请表 视图数据对象")
+public class BusHandoverPrepareVehicleVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("交车申请表sid")
+    private String mainSid; // 交车申请表sid
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+    @ApiModelProperty("开票状态")
+    private int invoicingState; // 开票状态
+    @ApiModelProperty("合格证状态")
+    private int certificateState; // 合格证状态
+    @ApiModelProperty("保单状态")
+    private int policyState; // 保单状态
+    @ApiModelProperty("随车资料状态")
+    private int onBoardDataState; // 随车资料状态
+    @ApiModelProperty("其他资料状态")
+    private int otherDataState; // 其他资料状态
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+
+}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java

@@ -717,9 +717,9 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
                 appMaps.put("contractSid", busAdvanceGinvoiceapply.getSid());
                 List<String> recipientSidList = new ArrayList<>();
 
-                // 风控中心总经理角色用户
+                // 风控中心风控内勤
                 UserRoleQuery userRoleQuery = new UserRoleQuery();
-                userRoleQuery.setRoleSid("537bea8f-75e8-430c-9a5f-3140bda41f39");
+                userRoleQuery.setRoleSid("967e63b0-3b7a-49ed-b42a-d4f904ab84f4");
                 List<SysUserVo> list1 = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData();
                 for (SysUserVo userVo : list1) {
                     recipientSidList.add(userVo.getSid());

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java

@@ -453,6 +453,8 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
     public ResultBean<AppArrearsCarryInfoVo> initArrearsApply(AppAdvanceArrearsInfoQuery query) {
         ResultBean rb = ResultBean.fireFail();
         String contractSid = query.getContractSid();
+        String userSid = query.getUserSid();
+        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
         List<AdCarListVo> carList = new ArrayList<>();
         List<AdCarListVo> vinList = new ArrayList<>();
         AppArrearsCarryInfoVo vo = new AppArrearsCarryInfoVo();
@@ -468,6 +470,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                 AdCarListVo adCarListVo = new AdCarListVo();
                 adCarListVo.setPrice(String.valueOf(carryVehicleDetailsVo.getDealMoney())); //成交价
                 adCarListVo.setVin(carryVehicleDetailsVo.getVinNo());//车架号
+                adCarListVo.setCarSid(carryVehicleDetailsVo.getVehicleSid());
                 adCarListVo.setRemarks(carryVehicleDetailsVo.getRemarks());//备注
                 carList.add(adCarListVo);
             }
@@ -478,6 +481,11 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
             for (AppRovalContractPageVo appRovalContractPageVo : vinLists) {
                 AdCarListVo adCarListVo = new AdCarListVo();
                 adCarListVo.setVin(appRovalContractPageVo.getVin());
+                //获取车辆sid
+                BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(appRovalContractPageVo.getVin(), useOrgSid).getData();
+                if (baseVehicle != null) {
+                    adCarListVo.setCarSid(baseVehicle.getSid());
+                }
                 CommonContractVo commonContractVo = commonContractFeign.getContractBySalesOrderSid(appRovalContractPageVo.getBusSid()).getData();
                 if (commonContractVo != null) {
                     adCarListVo.setPrice(commonContractVo.getPrice());
@@ -486,6 +494,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
             }
         }
         vo.setVinList(vinList);
+        vo.setContractSid(contractSid);
         return rb.success().setData(vo);
     }
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleMapper.java

@@ -72,7 +72,7 @@ public interface BusDepositVehicleMapper extends BaseMapper<BusDepositVehicle> {
     int updateFlowFiled(Map<String, Object> map);
 
 
-    int selByUserSid(@Param("createBySid") String createBySid);
+    List<String> selByUserSid(@Param("createBySid") String createBySid);
 
     List<BusMainDeposit> selectListByState(@Param("date") String tomorrow,@Param("nodeState") String nodeState, @Param("key") String key);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleMapper.xml

@@ -66,10 +66,17 @@
         FROM bus_deposit_vehicle bdv
         WHERE bdv.billSid = #{virtualOrderSid}
     </select>
-    <select id="selByUserSid" resultType="java.lang.Integer">
-        SELECT count(*)
-        FROM bus_deposit_vehicle bdv
-        WHERE bdv.createBySid = #{createBySid}
+    <select id="selByUserSid" resultType="java.lang.String">
+        SELECT
+            bdv.sid
+        FROM
+            bus_deposit_vehicle bdv
+                LEFT JOIN bus_main_deposit bmd ON bmd.sid = bdv.billSid
+        WHERE
+            bdv.createBySid = #{createBySid}
+          AND  bmd.nodeState = '已办结'
+        GROUP BY
+            bdv.vinNo
     </select>
 
     <update id="updateFlowFiled">

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleService.java

@@ -290,9 +290,9 @@ public class BusDepositVehicleService extends MybatisBaseService<BusDepositVehic
         vo.setVehicleList(appBusDepositVehicleListVos);
         if (StringUtils.isNotBlank(busMainDeposit.getNodeState())) {
             String createBySid = busMainDeposit.getCreateBySid();
-            int count = baseMapper.selByUserSid(createBySid);
+            List<String> list = baseMapper.selByUserSid(createBySid);
 //            Integer count = strings.stream().mapToInt(Integer::valueOf).sum();
-            vo.setExplain("目前该销售人员已预订" + count + "台车辆");
+            vo.setExplain("目前该销售人员已预订" + list.size() + "台车辆");
         }
         return new ResultBean<AppBusDepositVehicleDetailVo>().success().setData(vo);
     }

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

@@ -0,0 +1,70 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.biz.bushandoverprepare;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.buscenter.api.bushandoverprepare.app.AppHandoverPreparePageQuery;
+import com.yxt.anrui.buscenter.api.bushandoverprepare.app.AppHandoverPreparePageVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.buscenter.api.bushandoverprepare.BusHandoverPrepare;
+import com.yxt.anrui.buscenter.api.bushandoverprepare.BusHandoverPrepareVo;
+
+import java.util.List;
+
+/**
+ * Project: bus_handover(交车准备) <br/>
+ * File: BusHandoverPrepareMapper.java <br/>
+ * Class: com.yxt.anrui.buscenter.biz.bushandoverprepare.BusHandoverPrepareMapper <br/>
+ * Description: 交车准备-申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-09 15:44:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface BusHandoverPrepareMapper extends BaseMapper<BusHandoverPrepare> {
+
+    //@Update("update bus_handover_prepare set name=#{msg} where id=#{id}")
+    //IPage<BusHandoverPrepareVo> voPage(IPage<BusHandoverPrepare> page, @Param(Constants.WRAPPER) QueryWrapper<BusHandoverPrepare> qw);
+
+    IPage<BusHandoverPrepareVo> selectPageVo(IPage<BusHandoverPrepare> page, @Param(Constants.WRAPPER) Wrapper<BusHandoverPrepare> qw);
+
+    List<BusHandoverPrepareVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusHandoverPrepare> qw);
+
+    @Select("select * from bus_handover_prepare")
+    List<BusHandoverPrepareVo> selectListVo();
+
+    IPage<AppHandoverPreparePageVo> getDeliveryPlanList(IPage<AppHandoverPreparePageQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppHandoverPreparePageVo> qw, @Param("name") String name);
+}

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

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.buscenter.biz.bushandoverprepare.BusHandoverPrepareMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.bushandoverprepare.BusHandoverPrepareVo">
+        SELECT * FROM bus_handover_prepare
+        <where>${ew.sqlSegment}</where>
+    </select>
+
+    <select id="selectListAllVo" resultType="com.yxt.anrui.buscenter.api.bushandoverprepare.BusHandoverPrepareVo">
+        SELECT * FROM bus_handover_prepare
+        <where>${ew.sqlSegment}</where>
+    </select>
+    <select id="getDeliveryPlanList"
+            resultType="com.yxt.anrui.buscenter.api.bushandoverprepare.app.AppHandoverPreparePageVo">
+        SELECT
+        sid,
+        customerName,
+        mobile,
+        contractNo,
+        model,
+        payType,
+        num,
+        handoverPrepareState,
+        handoverPrepareStateKey
+        FROM bus_handover_prepare
+        <where>
+            ${ew.sqlSegment}
+            <if test="name != null and name != ''">
+                and concat(IFNULL(customerName
+                , '')
+                , ifnull(contractNo
+                , '')) LIKE concat('%'
+                , #{name}
+                , '%')
+            </if>
+        </where>
+    </select>
+</mapper>

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

@@ -0,0 +1,161 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.biz.bushandoverprepare;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.buscenter.api.bushandoverprepare.*;
+import com.yxt.anrui.buscenter.api.bushandoverprepare.app.*;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * Project: bus_handover(交车准备) <br/>
+ * File: BusHandoverPrepareFeignFallback.java <br/>
+ * Class: com.yxt.anrui.buscenter.biz.bushandoverprepare.BusHandoverPrepareRest <br/>
+ * Description: 交车准备-申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-09 15:44:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "交车准备-申请表")
+@RestController("com.yxt.anrui.buscenter.biz.bushandoverprepare.BusHandoverPrepareRest")
+@RequestMapping("v1/bushandoverprepare")
+public class BusHandoverPrepareRest implements BusHandoverPrepareFeign {
+
+    @Autowired
+    private BusHandoverPrepareService busHandoverPrepareService;
+
+    @Override
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<BusHandoverPrepareVo>> listPage(@RequestBody PagerQuery<BusHandoverPrepareQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<BusHandoverPrepareVo> pv = busHandoverPrepareService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+
+    @Override
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody BusHandoverPrepareDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        busHandoverPrepareService.saveOrUpdateDto(dto);
+        return rb.success();
+    }
+
+    @Override
+    @ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        busHandoverPrepareService.delBySids(sids);
+        return rb.success();
+    }
+
+    @Override
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<BusHandoverPrepareDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        BusHandoverPrepareDetailsVo vo = busHandoverPrepareService.fetchDetailsVoBySid(sid);
+        return rb.success().setData(vo);
+    }
+
+    @Override
+    public ResultBean addHandoverPrepare(BusHandoverPrepareAddDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        busHandoverPrepareService.addHandoverPrepare(dto);
+        return rb.success();
+    }
+
+    @Override
+    public ResultBean<PagerVo<AppHandoverPreparePageVo>> getDeliveryPlanList(PagerQuery<AppHandoverPreparePageQuery> pagerQuery) {
+        PagerVo<AppHandoverPreparePageVo> page = new PagerVo<>();
+        IPage<AppHandoverPreparePageVo> iPage = busHandoverPrepareService.getDeliveryPlanList(pagerQuery);
+        PagerVo<AppHandoverPreparePageVo> pagerVo = PagerUtil.pageToVo(iPage, page);
+        return new ResultBean<PagerVo<AppHandoverPreparePageVo>>().success().setData(pagerVo);
+    }
+
+    @Override
+    public ResultBean<AppBusHandoverPrepareInfoVo> getDeliveryPlanInfo(AppBusHandoverPrepareInfoQuery query) {
+        return busHandoverPrepareService.getDeliveryPlanInfo(query);
+    }
+
+    @Override
+    public ResultBean saveState(AppStateDateDto dto) {
+        return busHandoverPrepareService.saveState(dto);
+    }
+
+    @Override
+    public ResultBean<AppInvoicingInfoVo> getInvoiceInfo(AppInvoicingInfoQuery query) {
+        return busHandoverPrepareService.getInvoiceInfo(query);
+    }
+
+    @Override
+    public ResultBean<AppCertificateInfoVo> getCertificateInfo(AppCertificateInfoQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<AppPolicyInfoVo> getPolicyInfo(AppPolicyInfoQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean savePolicyInfo(AppPolicyDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<AppOtherDataInfoVo> getOtherDataInfo(AppOtherDataInfoQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveOtherDataInfo(AppOtherDataDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveDeliveryPlanInfo(AppHandoverPrepareDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<AppBusHandoverPrepareInfoVo> getDeliveryPlanInfoDetail(AppBusHandoverPrepareInfoQuery query) {
+        return null;
+    }
+}

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

@@ -0,0 +1,177 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.biz.bushandoverprepare;
+
+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.buscenter.api.bushandoverprepare.*;
+import com.yxt.anrui.buscenter.api.bushandoverprepare.app.*;
+import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.AppBusHandoverPrepareVehicleDto;
+import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.AppBusHandoverPrepareVehicleInfoVo;
+import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicle;
+import com.yxt.anrui.buscenter.biz.bushandoverpreparevehicle.BusHandoverPrepareVehicleService;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.common.core.result.ResultBean;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.vo.PagerVo;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: bus_handover(交车准备) <br/>
+ * File: BusHandoverPrepareService.java <br/>
+ * Class: com.yxt.anrui.buscenter.biz.bushandoverprepare.BusHandoverPrepareService <br/>
+ * Description: 交车准备-申请表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-09 15:44:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPrepareMapper, BusHandoverPrepare> {
+    @Autowired
+    private BusHandoverPrepareVehicleService busHandoverPrepareVehicleService;
+    @Autowired
+    private SysStaffOrgFeign sysStaffOrgFeign;
+
+    private QueryWrapper<BusHandoverPrepare> createQueryWrapper(BusHandoverPrepareQuery query) {
+        // todo: 这里根据具体业务调整查询条件
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<BusHandoverPrepare> qw = new QueryWrapper<>();
+        return qw;
+    }
+
+    public PagerVo<BusHandoverPrepareVo> listPageVo(PagerQuery<BusHandoverPrepareQuery> pq) {
+        BusHandoverPrepareQuery query = pq.getParams();
+        QueryWrapper<BusHandoverPrepare> qw = createQueryWrapper(query);
+        IPage<BusHandoverPrepare> page = PagerUtil.queryToPage(pq);
+        IPage<BusHandoverPrepareVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<BusHandoverPrepareVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public void saveOrUpdateDto(BusHandoverPrepareDto dto) {
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return;
+        }
+        this.updateByDto(dto);
+    }
+
+    public void insertByDto(BusHandoverPrepareDto dto) {
+        BusHandoverPrepare entity = new BusHandoverPrepare();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+    }
+
+    public void updateByDto(BusHandoverPrepareDto dto) {
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        }
+        BusHandoverPrepare entity = fetchBySid(dtoSid);
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.updateById(entity);
+    }
+
+    public BusHandoverPrepareDetailsVo fetchDetailsVoBySid(String sid) {
+        BusHandoverPrepare entity = fetchBySid(sid);
+        BusHandoverPrepareDetailsVo vo = new BusHandoverPrepareDetailsVo();
+        BeanUtil.copyProperties(entity, vo);
+        return vo;
+    }
+
+    public void addHandoverPrepare(BusHandoverPrepareAddDto dto) {
+        BusHandoverPrepare busHandoverPrepare = new BusHandoverPrepare();
+        BeanUtil.copyProperties(dto, busHandoverPrepare);
+        List<AppBusHandoverPrepareVehicleDto> handoverPrepareVehicleDtos = dto.getAppBusHandoverPrepareVehicleDtos();
+        if (handoverPrepareVehicleDtos.size() > 0) {
+            for (AppBusHandoverPrepareVehicleDto handoverPrepareVehicleDto : handoverPrepareVehicleDtos) {
+                BusHandoverPrepareVehicle busHandoverPrepareVehicle = new BusHandoverPrepareVehicle();
+                BeanUtil.copyProperties(handoverPrepareVehicleDto, busHandoverPrepareVehicle);
+                busHandoverPrepareVehicle.setMainSid(busHandoverPrepare.getSid());
+                busHandoverPrepareVehicleService.save(busHandoverPrepareVehicle);
+            }
+        }
+        save(busHandoverPrepare);
+    }
+
+    public IPage<AppHandoverPreparePageVo> getDeliveryPlanList(PagerQuery<AppHandoverPreparePageQuery> pagerQuery) {
+        IPage<AppHandoverPreparePageQuery> page = PagerUtil.queryToPage(pagerQuery);
+        AppHandoverPreparePageQuery params = pagerQuery.getParams();
+        String userSid = params.getUserSid();
+        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        QueryWrapper<AppHandoverPreparePageVo> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(params.getType())) {
+            qw.eq("handoverPrepareStateKey", params.getType());
+        }
+        if (StringUtils.isNotBlank(useOrgSid)) {
+            qw.eq("useOrgSid", useOrgSid);
+        }
+        IPage<AppHandoverPreparePageVo> iPage = baseMapper.getDeliveryPlanList(page, qw, params.getName());
+        for (AppHandoverPreparePageVo record : iPage.getRecords()) {
+            if ("1".equals(record.getHandoverPrepareStateKey())) {
+                record.setIsShowUpData(true);
+            } else if ("2".equals(record.getHandoverPrepareStateKey())) {
+                record.setIsShowUpData(false);
+            }
+        }
+        return iPage;
+    }
+
+    public ResultBean<AppBusHandoverPrepareInfoVo> getDeliveryPlanInfo(AppBusHandoverPrepareInfoQuery query) {
+        ResultBean<AppBusHandoverPrepareInfoVo> rb = ResultBean.fireFail();
+        String sid = query.getSid();
+        AppBusHandoverPrepareInfoVo appBusHandoverPrepareInfoVo = new AppBusHandoverPrepareInfoVo();
+        BusHandoverPrepare busHandoverPrepare = fetchBySid(sid);
+        BeanUtil.copyProperties(busHandoverPrepare, appBusHandoverPrepareInfoVo);
+        List<AppBusHandoverPrepareVehicleInfoVo> list = busHandoverPrepareVehicleService.selByMainSid(sid);
+        appBusHandoverPrepareInfoVo.setCarDataList(list);
+        appBusHandoverPrepareInfoVo.setUserSid(query.getUserSid());
+        return rb.setData(appBusHandoverPrepareInfoVo);
+    }
+
+    public ResultBean saveState(AppStateDateDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        busHandoverPrepareVehicleService.saveState(dto);
+        return rb.success();
+    }
+
+    public ResultBean<AppInvoicingInfoVo> getInvoiceInfo(AppInvoicingInfoQuery query) {
+        return null;
+    }
+}

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

@@ -0,0 +1,87 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.biz.bushandoverpreparevehicle;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.AppBusHandoverPrepareVehicleInfoVo;
+import com.yxt.common.core.result.ResultBean;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicle;
+import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicleVo;
+import org.apache.ibatis.annotations.Update;
+
+import java.util.List;
+
+/**
+ * Project: bus_handover(交车准备) <br/>
+ * File: BusHandoverPrepareVehicleMapper.java <br/>
+ * Class: com.yxt.anrui.buscenter.biz.bushandoverpreparevehicle.BusHandoverPrepareVehicleMapper <br/>
+ * Description: 交车准备-申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-09 15:44:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface BusHandoverPrepareVehicleMapper extends BaseMapper<BusHandoverPrepareVehicle> {
+
+    //@Update("update bus_handover_prepare_vehicle set name=#{msg} where id=#{id}")
+    //IPage<BusHandoverPrepareVehicleVo> voPage(IPage<BusHandoverPrepareVehicle> page, @Param(Constants.WRAPPER) QueryWrapper<BusHandoverPrepareVehicle> qw);
+
+    IPage<BusHandoverPrepareVehicleVo> selectPageVo(IPage<BusHandoverPrepareVehicle> page, @Param(Constants.WRAPPER) Wrapper<BusHandoverPrepareVehicle> qw);
+
+    List<BusHandoverPrepareVehicleVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusHandoverPrepareVehicle> qw);
+
+    @Select("select * from bus_handover_prepare_vehicle")
+    List<BusHandoverPrepareVehicleVo> selectListVo();
+
+    @Select("select * from bus_handover_prepare_vehicle where mainSid = #{sid} ")
+    List<AppBusHandoverPrepareVehicleInfoVo> selByMainSid(@Param("sid") String sid);
+
+
+    @Update("update bus_handover_prepare_vehicle set invoicingState = 1 where mainSid = #{sid} and vinNo = #{vin}")
+    void saveInvoiceState(@Param("sid") String sid, @Param("vin") String vin);
+
+    @Update("update bus_handover_prepare_vehicle set  certificateState = 1 where mainSid = #{sid} and vinNo = #{vin} ")
+    void saveCertificateState(@Param("sid") String sid, @Param("vin") String vin);
+
+    @Update("update bus_handover_prepare_vehicle set policyState = 1 where mainSid = #{sid} and vinNo = #{vin}  ")
+    void savePolicyState(@Param("sid") String sid, @Param("vin") String vin);
+
+    @Update("update bus_handover_prepare_vehicle set  onBoardDataState = 1 where mainSid = #{sid} and vinNo = #{vin} ")
+    void saveOnBoardState(@Param("sid") String sid, @Param("vin") String vin);
+
+    @Update("update bus_handover_prepare_vehicle set otherDataState = 1 where mainSid = #{sid} and vinNo = #{vin}  ")
+    void saveOtherDataState(@Param("sid") String sid, @Param("vin") String vin);
+}

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

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.buscenter.biz.bushandoverpreparevehicle.BusHandoverPrepareVehicleMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicleVo">
+		SELECT * FROM bus_handover_prepare_vehicle <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicleVo">
+		SELECT * FROM bus_handover_prepare_vehicle <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>

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

@@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.biz.bushandoverpreparevehicle;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicle;
+import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicleQuery;
+import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicleVo;
+import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicleDetailsVo;
+import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicleDto;
+import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicleFeign;
+
+/**
+ * Project: bus_handover(交车准备) <br/>
+ * File: BusHandoverPrepareVehicleFeignFallback.java <br/>
+ * Class: com.yxt.anrui.buscenter.biz.bushandoverpreparevehicle.BusHandoverPrepareVehicleRest <br/>
+ * Description: 交车准备-申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-09 15:44:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "交车准备-申请表")
+@RestController("com.yxt.anrui.buscenter.biz.bushandoverpreparevehicle.BusHandoverPrepareVehicleRest")
+@RequestMapping("v1/bushandoverpreparevehicle")
+public class BusHandoverPrepareVehicleRest implements BusHandoverPrepareVehicleFeign {
+
+	@Autowired
+	private BusHandoverPrepareVehicleService busHandoverPrepareVehicleService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<BusHandoverPrepareVehicleVo>> listPage(@RequestBody PagerQuery<BusHandoverPrepareVehicleQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<BusHandoverPrepareVehicleVo> pv = busHandoverPrepareVehicleService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody BusHandoverPrepareVehicleDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		busHandoverPrepareVehicleService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		busHandoverPrepareVehicleService.delBySids(sids);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<BusHandoverPrepareVehicleDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		BusHandoverPrepareVehicleDetailsVo vo = busHandoverPrepareVehicleService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}

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

@@ -0,0 +1,133 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.biz.bushandoverpreparevehicle;
+
+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.buscenter.api.bushandoverprepare.app.AppStateDateDto;
+import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.*;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+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.Service;
+
+import java.util.List;
+
+/**
+ * Project: bus_handover(交车准备) <br/>
+ * File: BusHandoverPrepareVehicleService.java <br/>
+ * Class: com.yxt.anrui.buscenter.biz.bushandoverpreparevehicle.BusHandoverPrepareVehicleService <br/>
+ * Description: 交车准备-申请表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-09 15:44:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class BusHandoverPrepareVehicleService extends MybatisBaseService<BusHandoverPrepareVehicleMapper, BusHandoverPrepareVehicle> {
+    private QueryWrapper<BusHandoverPrepareVehicle> createQueryWrapper(BusHandoverPrepareVehicleQuery query) {
+        // todo: 这里根据具体业务调整查询条件
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<BusHandoverPrepareVehicle> qw = new QueryWrapper<>();
+        return qw;
+    }
+
+    public PagerVo<BusHandoverPrepareVehicleVo> listPageVo(PagerQuery<BusHandoverPrepareVehicleQuery> pq) {
+        BusHandoverPrepareVehicleQuery query = pq.getParams();
+        QueryWrapper<BusHandoverPrepareVehicle> qw = createQueryWrapper(query);
+        IPage<BusHandoverPrepareVehicle> page = PagerUtil.queryToPage(pq);
+        IPage<BusHandoverPrepareVehicleVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<BusHandoverPrepareVehicleVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public void saveOrUpdateDto(BusHandoverPrepareVehicleDto dto) {
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return;
+        }
+        this.updateByDto(dto);
+    }
+
+    public void insertByDto(BusHandoverPrepareVehicleDto dto) {
+        BusHandoverPrepareVehicle entity = new BusHandoverPrepareVehicle();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+    }
+
+    public void updateByDto(BusHandoverPrepareVehicleDto dto) {
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        }
+        BusHandoverPrepareVehicle entity = fetchBySid(dtoSid);
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.updateById(entity);
+    }
+
+    public BusHandoverPrepareVehicleDetailsVo fetchDetailsVoBySid(String sid) {
+        BusHandoverPrepareVehicle entity = fetchBySid(sid);
+        BusHandoverPrepareVehicleDetailsVo vo = new BusHandoverPrepareVehicleDetailsVo();
+        BeanUtil.copyProperties(entity, vo);
+        return vo;
+    }
+
+    public List<AppBusHandoverPrepareVehicleInfoVo> selByMainSid(String sid) {
+        List<AppBusHandoverPrepareVehicleInfoVo> list = baseMapper.selByMainSid(sid);
+        return list;
+    }
+
+    public void saveState(AppStateDateDto dto) {
+        String sid = dto.getSid();
+        String key = dto.getKey();
+        String vin = dto.getVin();
+        if ("01".equals(key)) {
+            baseMapper.saveInvoiceState(sid, vin);
+        }
+        if ("02".equals(key)) {
+            baseMapper.saveCertificateState(sid, vin);
+        }
+        if ("03".equals(key)) {
+            baseMapper.savePolicyState(sid, vin);
+        }
+        if ("04".equals(key)) {
+            baseMapper.saveOnBoardState(sid, vin);
+        }
+        if ("05".equals(key)) {
+            baseMapper.saveOtherDataState(sid, vin);
+        }
+
+    }
+}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java

@@ -32,6 +32,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
+import com.yxt.anrui.base.api.basevehicle.BusDepositVinListVo;
 import com.yxt.anrui.base.api.basevehicle.BusMainDepositUpdateQuery;
 import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigFeign;
 import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo;
@@ -1880,6 +1881,16 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         if (dto.getCarList().size() <= 0) {
             return rb.setMsg("请补充车辆信息");
         }
+        if (r != 2) {
+            List<AppBusDepositVehicleCarListDto> carList = dto.getCarList();
+            for (AppBusDepositVehicleCarListDto carListDto : carList) {
+                String carSid = carListDto.getCarSid();
+                BusDepositVinListVo busDepositVinListVo = baseVehicleFeign.getBusDepositVehByVehSid(carSid).getData();
+                if (!busDepositVinListVo.getLockedState().equals(VehicleState.LockEnum.UN_LOCK.getCode())) {
+                    return rb.setMsg("您所选车辆已被预定或锁定!");
+                }
+            }
+        }
         //新增修改保存
         ResultBean<String> resultBean = reserveCarInfo(dto);
         if (!resultBean.getSuccess()) {

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppCollectionConfirmationStateVo.java

@@ -0,0 +1,16 @@
+package com.yxt.anrui.fin.api.fincollectionconfirmation;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppCollectionConfirmationStateVo implements Vo {
+    private static final long serialVersionUID = -1351560055250587524L;
+
+    @ApiModelProperty("合同编号")
+    private String contractNo;
+
+    @ApiModelProperty("车架号")
+    private String vinNo;
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationDto.java

@@ -13,6 +13,9 @@ import java.util.List;
 @Data
 public class AppFinCollectionConfirmationDto implements Dto {
 
+    @ApiModelProperty("机构sid")
+    private String orgPath;
+
     @ApiModelProperty("款项确认sid")
     private String sid;
 

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationOrgPathQuery.java

@@ -0,0 +1,19 @@
+package com.yxt.anrui.fin.api.fincollectionconfirmation;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppFinCollectionConfirmationOrgPathQuery implements Query {
+    private static final long serialVersionUID = -1124576139838723852L;
+
+    @ApiModelProperty("申请sid")
+    private String collectionBillSid;
+
+    @ApiModelProperty("机构sid")
+    private String orgPath;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationQuery.java

@@ -13,4 +13,7 @@ public class AppFinCollectionConfirmationQuery implements Query {
     @ApiModelProperty("付款方名称")
     private String name;
 
+    @ApiModelProperty("机构sid")
+    private String orgPath;
+
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinSelectedReceivablesPaymentDetailsQuery.java

@@ -21,5 +21,8 @@ public class AppFinSelectedReceivablesPaymentDetailsQuery implements Query {
     @ApiModelProperty("分公司sid")
     private String useOrgSid;
 
+    @ApiModelProperty("机构sid")
+    private String orgPath;
+
 
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinSelectedReceivablesPaymentDetailsVo.java

@@ -37,4 +37,7 @@ public class AppFinSelectedReceivablesPaymentDetailsVo implements Vo {
     @ApiModelProperty("认款状态")
     private String state;
 
+    @ApiModelProperty("sid")
+    private String sid;
+
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java

@@ -33,6 +33,7 @@ import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -93,20 +94,20 @@ public interface FinCollectionConfirmationFeign {
     public ResultBean addCollectionConfirm(@RequestBody AppFinCollectionConfirmationDto dto);
 
     @ApiOperation("手机端—初始化收款确认申请")
-    @GetMapping("/initCollectionConfirm/{collectionBillSid}/{userSid}")
-    public ResultBean<AppFinCollectionConfirmationInitVo> initCollectionConfirm(@PathVariable("collectionBillSid") String collectionBillSid, @PathVariable("userSid") String userSid);
+    @GetMapping("/initCollectionConfirm")
+    public ResultBean<AppFinCollectionConfirmationInitVo> initCollectionConfirm(@SpringQueryMap AppFinCollectionConfirmationOrgPathQuery query);
 
     @ApiOperation("手机端—款项确认申请详情")
-    @GetMapping("/getCollectionConfirmDetail/{collectionBillSid}")
-    public ResultBean<AppFinCollectionConfirmationDetailedVo> getCollectionConfirmDetail(@PathVariable("collectionBillSid") String collectionBillSid);
+    @GetMapping("/getCollectionConfirmDetail")
+    public ResultBean<AppFinCollectionConfirmationDetailedVo> getCollectionConfirmDetail(@SpringQueryMap AppFinCollectionConfirmationOrgPathQuery query);
 
     @ApiOperation("手机端—提交款项确认申请")
     @PostMapping("/submitCollectionConfirm")
     public ResultBean submitCollectionConfirm(@RequestBody AppFinCollectionConfirmationDto dto);
 
     @ApiOperation("手机端—删除收款确认单")
-    @DeleteMapping("/deleteCollectionConfirm/{collectionBillSid}")
-    public ResultBean deleteCollectionConfirm(@PathVariable("collectionBillSid") String collectionBillSid);
+    @DeleteMapping("/deleteCollectionConfirm")
+    public ResultBean deleteCollectionConfirm(@SpringQueryMap AppFinCollectionConfirmationOrgPathQuery query);
 
     @ApiOperation("手机端—查询可使用款项明细列表")
     @PostMapping("/getPaymentDetailsList")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java

@@ -93,12 +93,12 @@ public class FinCollectionConfirmationFeignFallback implements FinCollectionConf
     }
 
     @Override
-    public ResultBean<AppFinCollectionConfirmationInitVo> initCollectionConfirm(String collectionBillSid, String userSid) {
+    public ResultBean<AppFinCollectionConfirmationInitVo> initCollectionConfirm(AppFinCollectionConfirmationOrgPathQuery query) {
         return null;
     }
 
     @Override
-    public ResultBean<AppFinCollectionConfirmationDetailedVo> getCollectionConfirmDetail(String collectionBillSid) {
+    public ResultBean<AppFinCollectionConfirmationDetailedVo> getCollectionConfirmDetail(AppFinCollectionConfirmationOrgPathQuery query) {
         return null;
     }
 
@@ -108,7 +108,7 @@ public class FinCollectionConfirmationFeignFallback implements FinCollectionConf
     }
 
     @Override
-    public ResultBean deleteCollectionConfirm(String collectionBillSid) {
+    public ResultBean deleteCollectionConfirm(AppFinCollectionConfirmationOrgPathQuery query) {
         return null;
     }
 

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/AppFinUncollectedReceivablesDetailedVo.java

@@ -36,4 +36,7 @@ public class AppFinUncollectedReceivablesDetailedVo implements Vo {
     @ApiModelProperty("认款状态")
     private String state;
 
+    @ApiModelProperty("sid")
+    private String sid;
+
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java

@@ -97,4 +97,7 @@ public interface FinCollectionConfirmationMapper extends BaseMapper<FinCollectio
     AppFinCollectionConfirmationDetailedVo getCollectionConfirmDetail(String collectionBillSid);
 
     List<String> billNoList();
+
+
+    List<AppCollectionConfirmationStateVo> selectByState();
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml

@@ -65,6 +65,7 @@
                collectionBankNum   AS collectionNum,
                collectionTypeValue AS collectionType,
                collectionMoney     AS paymentMoney,
+               paymentState        AS collectionBillState,
                paymentVoucherUrl,
                remarks
         FROM fin_collection_confirmation
@@ -72,6 +73,17 @@
     </select>
 
     <select id="billNoList" resultType="java.lang.String">
-        select busNo from fin_collection_confirmation where pushMessgae = 1 and auditState = 3
+        select busNo
+        from fin_collection_confirmation
+        where pushMessgae = 1
+          and auditState = 3
+    </select>
+    <select id="selectByState"
+            resultType="com.yxt.anrui.fin.api.fincollectionconfirmation.AppCollectionConfirmationStateVo">
+        select fsrd.contractNo,
+               fsrd.VIN as vinNo
+        from fin_collection_confirmation fcc
+                 left join fin_selected_receivables_detailed fsrd on fcc.sid = fsrd.collSid
+        where fcc.auditState = 1
     </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java

@@ -130,29 +130,28 @@ public class FinCollectionConfirmationRest implements FinCollectionConfirmationF
     /**
      * 手机端—初始化收款确认申请
      *
-     * @param collectionBillSid
-     * @param userSid
+     * @param query
      * @return
      */
     @Override
-    public ResultBean<AppFinCollectionConfirmationInitVo> initCollectionConfirm(String collectionBillSid, String userSid) {
+    public ResultBean<AppFinCollectionConfirmationInitVo> initCollectionConfirm(AppFinCollectionConfirmationOrgPathQuery query) {
         ResultBean<AppFinCollectionConfirmationInitVo> rb = ResultBean.fireFail();
-        if (StringUtils.isBlank(userSid)) {
+        if (StringUtils.isBlank(query.getUserSid())) {
             return rb.setMsg("用户sid不能为空");
         }
-        AppFinCollectionConfirmationInitVo data = finCollectionConfirmationService.initCollectionConfirm(collectionBillSid, userSid).getData();
+        AppFinCollectionConfirmationInitVo data = finCollectionConfirmationService.initCollectionConfirm(query).getData();
         return rb.success().setData(data);
     }
 
     /**
      * 手机端—款项确认申请详情
      *
-     * @param collectionBillSid
+     * @param query
      * @return
      */
     @Override
-    public ResultBean<AppFinCollectionConfirmationDetailedVo> getCollectionConfirmDetail(String collectionBillSid) {
-        return finCollectionConfirmationService.getCollectionConfirmDetail(collectionBillSid);
+    public ResultBean<AppFinCollectionConfirmationDetailedVo> getCollectionConfirmDetail(AppFinCollectionConfirmationOrgPathQuery query) {
+        return finCollectionConfirmationService.getCollectionConfirmDetail(query);
     }
 
     /**
@@ -169,12 +168,12 @@ public class FinCollectionConfirmationRest implements FinCollectionConfirmationF
     /**
      * 手机端—删除收款确认单
      *
-     * @param collectionBillSid
+     * @param query
      * @return
      */
     @Override
-    public ResultBean deleteCollectionConfirm(String collectionBillSid) {
-        return finCollectionConfirmationService.deleteCollectionConfirm(collectionBillSid);
+    public ResultBean deleteCollectionConfirm(AppFinCollectionConfirmationOrgPathQuery query) {
+        return finCollectionConfirmationService.deleteCollectionConfirm(query);
     }
 
     /**

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -340,6 +340,14 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
      */
     public IPage<AppFinCollectionConfirmationPageVo> getCollectionConfirmList(PagerQuery<AppFinCollectionConfirmationQuery> pagerQuery) {
         IPage<AppFinCollectionConfirmationQuery> page = PagerUtil.queryToPage(pagerQuery);
+        String orgPath = pagerQuery.getParams().getOrgPath();
+        String orgSid = "";
+        if (StringUtils.isNotBlank(pagerQuery.getParams().getOrgPath())) {
+            orgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+        } else {
+            orgSid = sysStaffOrgFeign.getPathSidByUserSid(orgPath).getData();
+        }
+        pagerQuery.getParams().setOrgPath(orgSid);
         QueryWrapper<AppFinCollectionConfirmationPageVo> qw = appBuildQueryWrapper(pagerQuery.getParams());
         IPage<AppFinCollectionConfirmationPageVo> collectionConfirmList = baseMapper.getCollectionConfirmList(page, qw);
         for (AppFinCollectionConfirmationPageVo record : collectionConfirmList.getRecords()) {
@@ -351,13 +359,18 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             //审核状态：1待审核/2已驳回/3已审核
             int collectionBillState = record.getAuditState();
             if (i <= 0) {
-                if (collectionBillState == 1 && collectionBillState == 3) {
+                if (collectionBillState == 1 || collectionBillState == 3) {
                     record.setShowHandle(false);
+                } else {
+                    record.setShowHandle(true);
                 }
+            } else {
+                if (collectionBillState == 1 || collectionBillState == 3) {
                     record.setShowHandle(false);
                 } else {
                     record.setShowHandle(true);
                 }
+            }
             if (collectionBillState == 3) {
                 record.setShowDownload(false);
             }
@@ -385,11 +398,14 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
     private QueryWrapper<AppFinCollectionConfirmationPageVo> appBuildQueryWrapper(AppFinCollectionConfirmationQuery pagerQuery) {
         QueryWrapper<AppFinCollectionConfirmationPageVo> qw = new QueryWrapper<>();
         if (pagerQuery != null) {
-            if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getName())) {//付款方名称
+            if (StringUtils.isNotBlank(pagerQuery.getName())) {//付款方名称
                 qw.like("payerName", pagerQuery.getName());
             }
+            if (StringUtils.isNotBlank(pagerQuery.getOrgPath())) {
+                qw.eq("useOrgSid", pagerQuery.getOrgPath());
+            }
         }
-        qw.eq("pushMessage",0);
+        qw.eq("pushMessgae", 0);
         return qw;
     }
 
@@ -403,12 +419,16 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
     public ResultBean addCollectionConfirm(AppFinCollectionConfirmationDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String staffSid = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData().getStaffSid();
-        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
+        String orgSid = "";
+        if (StringUtils.isNotBlank(dto.getOrgPath())) {
+            orgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
+        } else {
+            orgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
+        }
         FinCollectionConfirmation finCollectionConfirmation = new FinCollectionConfirmation();
         CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
         BeanUtil.copyProperties(dto, finCollectionConfirmation, "sid");
-        finCollectionConfirmation.setUseOrgSid(useOrgSid);
-
+        finCollectionConfirmation.setUseOrgSid(orgSid);
         List<String> payFiles = dto.getPayFiles();
         String payFilePath = "";
         for (String payFile : payFiles) {
@@ -446,13 +466,19 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
     /**
      * 手机端—初始化收款确认申请
      *
-     * @param collectionBillSid
-     * @param userSid
+     * @param query
      * @return
      */
-    public ResultBean<AppFinCollectionConfirmationInitVo> initCollectionConfirm(String collectionBillSid, String userSid) {
+    public ResultBean<AppFinCollectionConfirmationInitVo> initCollectionConfirm(AppFinCollectionConfirmationOrgPathQuery query) {
         ResultBean<AppFinCollectionConfirmationInitVo> rb = ResultBean.fireFail();
-        String useOrgSid = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid();
+        String orgPath = query.getOrgPath();
+        String collectionBillSid = query.getCollectionBillSid();
+        String useOrgSid = "";
+        if (StringUtils.isNotBlank(orgPath)) {
+            useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+        } else {
+            useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(query.getUserSid()).getData();
+        }
         AppFinCollectionConfirmationInitVo vo = baseMapper.initCollectionConfirm(collectionBillSid, useOrgSid);
         List<AppFinSelectedReceivablesPaymentDetailsVo> list = finSelectedReceivablesDetailedService.selectByCollSid(collectionBillSid);
         vo.setContractList(list);
@@ -463,18 +489,19 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             payFiles.add(url);
         }
         vo.setPayFiles(payFiles);
-        vo.setUserSid(userSid);
+        vo.setUserSid(query.getUserSid());
         return rb.success().setData(vo);
     }
 
     /**
      * 手机端—款项确认申请详情
      *
-     * @param collectionBillSid
+     * @param query
      * @return
      */
-    public ResultBean<AppFinCollectionConfirmationDetailedVo> getCollectionConfirmDetail(String collectionBillSid) {
+    public ResultBean<AppFinCollectionConfirmationDetailedVo> getCollectionConfirmDetail(AppFinCollectionConfirmationOrgPathQuery query) {
         ResultBean<AppFinCollectionConfirmationDetailedVo> rb = ResultBean.fireFail();
+        String collectionBillSid = query.getCollectionBillSid();
         AppFinCollectionConfirmationDetailedVo vo = baseMapper.getCollectionConfirmDetail(collectionBillSid);
         List<AppFinSelectedReceivablesPaymentDetailsVo> list = finSelectedReceivablesDetailedService.selectByCollSid(collectionBillSid);
         vo.setContractList(list);
@@ -619,14 +646,14 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
     /**
      * 手机端—删除收款确认单
      *
-     * @param collectionBillSid
+     * @param
      * @return
      */
     @Transactional(rollbackFor = Exception.class)
-    public ResultBean deleteCollectionConfirm(String collectionBillSid) {
+    public ResultBean deleteCollectionConfirm(AppFinCollectionConfirmationOrgPathQuery query) {
         ResultBean rb = ResultBean.fireFail();
-        deleteBySid(collectionBillSid);
-        finSelectedReceivablesDetailedService.deleteByCollSid(collectionBillSid);
+        deleteBySid(query.getCollectionBillSid());
+        finSelectedReceivablesDetailedService.deleteByCollSid(query.getCollectionBillSid());
         return rb.success().setMsg("删除成功");
     }
 
@@ -639,12 +666,25 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
      */
     public IPage<AppFinUncollectedReceivablesDetailedVo> getPaymentDetailsList(PagerQuery<AppFinSelectedReceivablesPaymentDetailsQuery> pagerQuery) {
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
-        String useOrgSid = sysOrganizationFeign.getUseOrgByUserSid(pagerQuery.getParams().getUserSid()).getData().getSid();
-        if (StringUtils.isNotBlank(useOrgSid)) {
-            pagerQuery.getParams().setUseOrgSid(useOrgSid);
-        }
+        String orgPath = pagerQuery.getParams().getOrgPath();
+        String userSid = pagerQuery.getParams().getUserSid();
+        String useOrgSid = "";
         IPage<AppFinSelectedReceivablesPaymentDetailsQuery> page = PagerUtil.queryToPage(pagerQuery);
         QueryWrapper<AppFinUncollectedReceivablesDetailedVo> qw = appPaymentDetailsBuildQueryWrapper(pagerQuery.getParams());
+        if (StringUtils.isNotBlank(orgPath)) {
+            useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+        } else {
+            useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        }
+        if (StringUtils.isNotBlank(useOrgSid)) {
+            qw.eq("useOrgSid", useOrgSid);
+        }
+        qw.ne("currentReceivableMoney", 0);
+        List<AppCollectionConfirmationStateVo> vos = baseMapper.selectByState();
+        for (AppCollectionConfirmationStateVo vo : vos) {
+            vo.getContractNo();
+            vo.getVinNo();
+        }
         IPage<AppFinUncollectedReceivablesDetailedVo> collectionConfirmList = finSelectedReceivablesDetailedService.getPaymentDetailsList(page, qw);
         List<AppFinUncollectedReceivablesDetailedVo> records = collectionConfirmList.getRecords();
         for (AppFinUncollectedReceivablesDetailedVo record : records) {

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml

@@ -23,6 +23,7 @@
     <select id="getPaymentDetailsList"
             resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo">
         SELECT
+        sid,
         contractNo AS contractId,
         receivablesName AS projectName,
         customerPhone AS mobile,
@@ -61,7 +62,8 @@
     </select>
     <select id="selectByCollSid"
             resultType="com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsVo">
-        SELECT contractNo             as contractId,
+        SELECT sid,
+               contractNo             as contractId,
                receivablesName        as projectName,
                customerPhone          as mobile,
                customerName           as `name`,

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@@ -12,8 +12,8 @@ public enum ProcDefEnum {
     SALESPOLICY("销售政策审批流程", "process_biw9gfh7:1:707508"),//测试销售政策流程定义id
     FINBILLAPPLICATION("开票申请流程", "process_t5ksueur:1:252833"),
 //    ADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"),
-    BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:2:665066"), //本地
-//    BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:1:765004"),//测试
+    BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:3:820008"), //测试
+//    BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:1:765004"),//本地
 //    ARREARSCARRYVEHICLE("欠款提车审批流程", "process_ll25axqj:1:687508"),//本地
     ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:1:795004"),//测试
 //    VEHICLEAPPLY("排产申请流程", "process_9egcg169:7:467504"),//TODO

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsDto.java

@@ -16,7 +16,7 @@ public class AdvanceArrearsDto implements Dto {
     private String userSid;
     @ApiModelProperty("合同sid")
     @JsonProperty("contractSid")
-    private String sid;
+    private String contractSid;
     @ApiModelProperty("合同id")
     @JsonProperty("contractId")
     private String contractNo;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsInfoQuery.java

@@ -10,4 +10,7 @@ public class AdvanceArrearsInfoQuery implements Query {
 
     @ApiModelProperty("申请sid")
     private String contractSid;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsInfoVo.java

@@ -17,7 +17,7 @@ public class AdvanceArrearsInfoVo implements Vo {
     private String userSid;
     @ApiModelProperty("合同sid")
     @JsonProperty("contractSid")
-    private String sid;
+    private String contractSid;
     @ApiModelProperty("合同id")
     @JsonProperty("contractId")
     private String contractNo;
@@ -47,9 +47,16 @@ public class AdvanceArrearsInfoVo implements Vo {
     private List<AppCarListVo> carList = new ArrayList<>();
     @ApiModelProperty("所有车辆列表")
     private List<AppCarListVo> vinList = new ArrayList<>();
-    @ApiModelProperty("流程实列id")
-    private String procInsId;
-    @ApiModelProperty("用户sid")
+    @ApiModelProperty("任务id")
     private String taskId;
+    @ApiModelProperty("流程实例id")
+    @JsonProperty("procInsId")
+    private String procInstId;
+    @ApiModelProperty("流程定义id")
+    private String procDefId;
+    @ApiModelProperty("节点状态")
+    private String nodeState;
+    @ApiModelProperty("节点id")
+    private String nodeId;
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/flowable/SubmitArrearsTakeCarDto.java

@@ -1,12 +1,12 @@
 package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.yxt.common.core.dto.Dto;
+import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.AdvanceArrearsDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
-public class SubmitArrearsTakeCarDto implements Dto {
+public class SubmitArrearsTakeCarDto extends AdvanceArrearsDto {
     private static final long serialVersionUID = 2950377650362576923L;
 
     @ApiModelProperty("流程实例id")

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

@@ -0,0 +1,116 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.api.autoservice.deliveryPlan;
+
+import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.AdvanceInvoicePageQuery;
+import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.AdvanceInvoicePageVo;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * Project: bus_handover(交车准备) <br/>
+ * File: BusHandoverPrepareFeign.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.bushandoverprepare.BusHandoverPrepareFeign <br/>
+ * Description: 交车准备-申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-09 15:44:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "交车准备-申请表")
+@FeignClient(
+        contextId = "anrui-terminal-BusHandoverPrepare",
+        name = "anrui-terminal",
+        path = "autoservice/v1/deliveryPlan",
+        fallback = AppBusHandoverPrepareFeignFallback.class)
+public interface AppBusHandoverPrepareFeign {
+
+    @ApiOperation("手机端-获取交车准备申请列表")
+    @PostMapping("/getDeliveryPlanList")
+    @ResponseBody
+    ResultBean<PagerVo<HandoverPreparePageVo>> getDeliveryPlanList(@RequestBody PagerQuery<HandoverPreparePageQuery> pagerQuery);
+
+    @ApiOperation("手机端-初始化交车准备申请")
+    @PostMapping("/getDeliveryPlanInfo")
+    @ResponseBody
+    ResultBean<HandoverPrepareInfoVo> getDeliveryPlanInfo(@SpringQueryMap HandoverPrepareInfoQuery query);
+
+    @ApiOperation("修改交车准备 其他资料信息")
+    @PutMapping("/saveState")
+    @ResponseBody
+    ResultBean saveState(@RequestBody StateDateDto dto);
+
+    @ApiOperation("获取交车准备 发票信息")
+    @GetMapping("/getInvoiceInfo")
+    @ResponseBody
+    ResultBean<InvoicingInfoVo> getInvoiceInfo(@SpringQueryMap InvoicingInfoQuery query);
+
+    @ApiOperation("获取交车准备 合格证信息")
+    @GetMapping("/getCertificateInfo")
+    @ResponseBody
+    ResultBean<CertificateInfoVo> getCertificateInfo(@SpringQueryMap CertificateInfoQuery query);
+
+    @ApiOperation("获取交车准备 保单信息")
+    @GetMapping("/getPolicyInfo")
+    @ResponseBody
+    ResultBean<PolicyInfoVo> getPolicyInfo(@SpringQueryMap PolicyInfoQuery query);
+
+    @ApiOperation("修改交车准备 保单信息")
+    @PutMapping("/savePolicyInfo")
+    @ResponseBody
+    ResultBean savePolicyInfo(@RequestBody PolicyDto dto);
+
+    @ApiOperation("获取交车准备 其他资料信息")
+    @GetMapping("/getOtherDataInfo")
+    @ResponseBody
+    ResultBean<OtherDataInfoVo> getOtherDataInfo(@SpringQueryMap OtherDataInfoQuery query);
+
+    @ApiOperation("修改交车准备 其他资料信息")
+    @PutMapping("/saveOtherDataInfo")
+    @ResponseBody
+    ResultBean saveOtherDataInfo(@RequestBody OtherDataDto dto);
+
+    @ApiOperation("保存交车准备信息")
+    @PostMapping("/saveDeliveryPlanInfo")
+    @ResponseBody
+    ResultBean saveDeliveryPlanInfo(@RequestBody HandoverPrepareDto dto);
+
+    @ApiOperation("交车准备详情")
+    @GetMapping("/getDeliveryPlanInfoDetail")
+    @ResponseBody
+    ResultBean<HandoverPrepareInfoVo> getDeliveryPlanInfoDetail(@SpringQueryMap HandoverPrepareInfoQuery query);
+
+
+}

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

@@ -0,0 +1,106 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.api.autoservice.deliveryPlan;
+
+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;
+
+/**
+ * Project: bus_handover(交车准备) <br/>
+ * File: BusHandoverPrepareFeignFallback.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.bushandoverprepare.BusHandoverPrepareFeignFallback <br/>
+ * Description: 交车准备-申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-09 15:44:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class AppBusHandoverPrepareFeignFallback implements AppBusHandoverPrepareFeign {
+
+
+    @Override
+    public ResultBean<PagerVo<HandoverPreparePageVo>> getDeliveryPlanList(PagerQuery<HandoverPreparePageQuery> pagerQuery) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<HandoverPrepareInfoVo> getDeliveryPlanInfo(HandoverPrepareInfoQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveState(StateDateDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<InvoicingInfoVo> getInvoiceInfo(InvoicingInfoQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<CertificateInfoVo> getCertificateInfo(CertificateInfoQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<PolicyInfoVo> getPolicyInfo(PolicyInfoQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean savePolicyInfo(PolicyDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<OtherDataInfoVo> getOtherDataInfo(OtherDataInfoQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveOtherDataInfo(OtherDataDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveDeliveryPlanInfo(HandoverPrepareDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<HandoverPrepareInfoVo> getDeliveryPlanInfoDetail(HandoverPrepareInfoQuery query) {
+        return null;
+    }
+
+
+}

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

@@ -0,0 +1,18 @@
+package com.yxt.anrui.terminal.api.autoservice.deliveryPlan;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class CertificateInfoQuery implements Query {
+    private static final long serialVersionUID = 3659022580155238922L;
+
+    @ApiModelProperty("车架号")
+    private String vin;
+
+    @ApiModelProperty("车辆sid")
+    private String carSid;
+
+
+}

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

@@ -0,0 +1,24 @@
+package com.yxt.anrui.terminal.api.autoservice.deliveryPlan;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class CertificateInfoVo implements Vo {
+    private static final long serialVersionUID = -4490288226803925013L;
+
+    @ApiModelProperty("车架号")
+    private String vin;
+    @ApiModelProperty("车辆sid")
+    private String carSid;
+    @ApiModelProperty("")
+    private String invoice;
+    @ApiModelProperty("合格证日期")
+    private String date;
+    @ApiModelProperty("合格证附件")
+    private List<String> invoiceImages;
+
+}

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

@@ -0,0 +1,32 @@
+package com.yxt.anrui.terminal.api.autoservice.deliveryPlan;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class HandoverPrepareDto implements Dto {
+    private static final long serialVersionUID = -8440894378823670730L;
+
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("合同编号")
+    private String contractId;
+    @ApiModelProperty("车辆集合")
+    private List<HandoverPrepareVehicleDto> carDataList;
+    @ApiModelProperty("记录sid")
+    private String sid;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("组织机构")
+    private String orgPath;
+    @ApiModelProperty("付款方式")
+    private String payType;
+    @ApiModelProperty("车型")
+    private String model;
+    @ApiModelProperty("品牌")
+    private String brand;
+
+}

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

@@ -0,0 +1,17 @@
+package com.yxt.anrui.terminal.api.autoservice.deliveryPlan;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class HandoverPrepareInfoQuery implements Query {
+    private static final long serialVersionUID = 7773340499235695254L;
+
+    @ApiModelProperty("sid")
+    private String sid;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+}

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

@@ -0,0 +1,38 @@
+package com.yxt.anrui.terminal.api.autoservice.deliveryPlan;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class HandoverPrepareInfoVo implements Vo {
+    private static final long serialVersionUID = -123517694818315206L;
+
+    @ApiModelProperty("客户名称")
+    private String customerName;
+
+    @ApiModelProperty("合同编号")
+    private String contractNo;
+
+    @ApiModelProperty("sid")
+    private String sid;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+    @ApiModelProperty("付款方式")
+    private String payType;
+
+    @ApiModelProperty("车型")
+    private String model;
+
+    @ApiModelProperty("品牌")
+    private String brandName;
+
+    @ApiModelProperty("车辆集合")
+    private List<HandoverPrepareVehicleInfoVo> carDataList;
+
+
+}

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

@@ -0,0 +1,19 @@
+package com.yxt.anrui.terminal.api.autoservice.deliveryPlan;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class HandoverPreparePageQuery implements Query {
+    private static final long serialVersionUID = -6042480332658187357L;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+    @ApiModelProperty("")
+    private String name;
+
+    @ApiModelProperty("")
+    private String type;
+}

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

@@ -0,0 +1,44 @@
+package com.yxt.anrui.terminal.api.autoservice.deliveryPlan;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class HandoverPreparePageVo implements Vo {
+    private static final long serialVersionUID = 2289992457993721366L;
+
+    @ApiModelProperty("sid")
+    private String sid;
+
+    @ApiModelProperty("客户名称")
+    private String customerName;
+
+    @ApiModelProperty("联系电话")
+    private String mobile;
+
+    @ApiModelProperty("合同编号")
+    @JsonProperty("contractId")
+    private String contractNo;
+
+    @ApiModelProperty("车型")
+    private String model;
+
+    @ApiModelProperty("付款方式")
+    @JsonProperty("paymentMethod")
+    private String payType;
+
+    @ApiModelProperty("数量")
+    @JsonProperty("number")
+    private String num;
+
+    @ApiModelProperty("交车准备状态")
+    @JsonProperty("contractState")
+    private String handoverPrepareState;
+
+    @ApiModelProperty("是否显示i办理")
+    private Boolean isShowUpData;
+
+
+}

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

@@ -0,0 +1,33 @@
+package com.yxt.anrui.terminal.api.autoservice.deliveryPlan;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class HandoverPrepareVehicleDto implements Dto {
+
+    private static final long serialVersionUID = 54954240767288520L;
+    @ApiModelProperty("交车申请表sid")
+    private String mainSid; // 交车申请表sid
+    @ApiModelProperty("车架号")
+    @JsonProperty("vin")
+    private String vinNo; // 车架号
+    @ApiModelProperty("开票状态")
+    @JsonProperty("invoiceState")
+    private int invoicingState; // 开票状态
+    @ApiModelProperty("合格证状态")
+    @JsonProperty("certificateState")
+    private int certificateState; // 合格证状态
+    @ApiModelProperty("保单状态")
+    @JsonProperty("policyState")
+    private int policyState; // 保单状态
+    @ApiModelProperty("随车资料状态")
+    @JsonProperty("carState")
+    private int onBoardDataState; // 随车资料状态
+    @ApiModelProperty("其他资料状态")
+    @JsonProperty("otherState")
+    private int otherDataState; // 其他资料状态
+
+}

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

@@ -0,0 +1,34 @@
+package com.yxt.anrui.terminal.api.autoservice.deliveryPlan;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class HandoverPrepareVehicleInfoVo implements Vo {
+    private static final long serialVersionUID = 7834545131984653302L;
+
+    @ApiModelProperty("交车申请表sid")
+    private String mainSid; // 交车申请表sid
+    @ApiModelProperty("车架号")
+    @JsonProperty("vin")
+    private String vinNo; // 车架号
+    @ApiModelProperty("开票状态")
+    @JsonProperty("invoiceState")
+    private int invoicingState; // 开票状态
+    @ApiModelProperty("合格证状态")
+    @JsonProperty("certificateState")
+    private int certificateState; // 合格证状态
+    @ApiModelProperty("保单状态")
+    @JsonProperty("policyState")
+    private int policyState; // 保单状态
+    @ApiModelProperty("随车资料状态")
+    @JsonProperty("carState")
+    private int onBoardDataState; // 随车资料状态
+    @ApiModelProperty("其他资料状态")
+    @JsonProperty("otherState")
+    private int otherDataState; // 其他资料状态
+
+
+}

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

@@ -0,0 +1,17 @@
+package com.yxt.anrui.terminal.api.autoservice.deliveryPlan;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class InvoicingInfoQuery implements Query {
+    private static final long serialVersionUID = -9046153131499325630L;
+
+    @ApiModelProperty("车架号")
+    private String vin;
+
+    @ApiModelProperty("车辆sid")
+    private String carSid;
+
+}

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

@@ -0,0 +1,24 @@
+package com.yxt.anrui.terminal.api.autoservice.deliveryPlan;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class InvoicingInfoVo implements Vo {
+    private static final long serialVersionUID = 4861045386236473486L;
+
+    @ApiModelProperty("车架号")
+    private String vin;
+    @ApiModelProperty("车辆sid")
+    private String carSid;
+    @ApiModelProperty("发票代码")
+    private String invoice;
+    @ApiModelProperty("开票日期")
+    private String date;
+    @ApiModelProperty("开票附件")
+    private List<String> invoiceImages;
+
+}

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

@@ -0,0 +1,22 @@
+package com.yxt.anrui.terminal.api.autoservice.deliveryPlan;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class OtherDataDto implements Dto {
+    private static final long serialVersionUID = -3050856559210777413L;
+
+    @ApiModelProperty("")
+    private String sid;
+    @ApiModelProperty("车辆sid")
+    private String carSid;
+    @ApiModelProperty("车架号")
+    private String vin;
+    @ApiModelProperty("其他资料照片")
+    private List<String> otherInfo;
+
+}

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

@@ -0,0 +1,20 @@
+package com.yxt.anrui.terminal.api.autoservice.deliveryPlan;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class OtherDataInfoQuery implements Query {
+    private static final long serialVersionUID = -2645426505344369850L;
+
+    @ApiModelProperty("")
+    private String sid;
+    @ApiModelProperty("车辆sid")
+    private String carSid;
+    @ApiModelProperty("车架号")
+    private String vin;
+
+}

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

@@ -0,0 +1,22 @@
+package com.yxt.anrui.terminal.api.autoservice.deliveryPlan;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class OtherDataInfoVo implements Vo {
+    private static final long serialVersionUID = 3389392232627388039L;
+
+    @ApiModelProperty("")
+    private String sid;
+    @ApiModelProperty("车辆sid")
+    private String carSid;
+    @ApiModelProperty("车架号")
+    private String vin;
+    @ApiModelProperty("其他资料照片")
+    private List<String> otherInfo;
+
+}

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

@@ -0,0 +1,23 @@
+package com.yxt.anrui.terminal.api.autoservice.deliveryPlan;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PolicyDto implements Dto {
+    private static final long serialVersionUID = -3855776230880636129L;
+
+    @ApiModelProperty("保单照片")
+    private List<String> policyList;
+    @ApiModelProperty("临时牌照")
+    private List<String> licenceList;
+    @ApiModelProperty("sid")
+    private String sid;
+    @ApiModelProperty("车辆照片")
+    private String carSid;
+    @ApiModelProperty("车架号")
+    private String vin;
+}

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

@@ -0,0 +1,20 @@
+package com.yxt.anrui.terminal.api.autoservice.deliveryPlan;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class PolicyInfoQuery implements Query {
+    private static final long serialVersionUID = 7475128359557107062L;
+
+    @ApiModelProperty("sid")
+    private String sid;
+
+    @ApiModelProperty("车架号")
+    private String vin;
+
+    @ApiModelProperty("车辆sid")
+    private String carSid;
+
+}

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

@@ -0,0 +1,24 @@
+package com.yxt.anrui.terminal.api.autoservice.deliveryPlan;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PolicyInfoVo implements Vo {
+    private static final long serialVersionUID = -2720117738136247298L;
+
+    @ApiModelProperty("保单照片")
+    private List<String> policyList;
+    @ApiModelProperty("临时牌照")
+    private List<String> licenceList;
+    @ApiModelProperty("sid")
+    private String sid;
+    @ApiModelProperty("车辆照片")
+    private String carSid;
+    @ApiModelProperty("车架号")
+    private String vin;
+
+}

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

@@ -0,0 +1,18 @@
+package com.yxt.anrui.terminal.api.autoservice.deliveryPlan;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class StateDateDto implements Dto {
+    private static final long serialVersionUID = -5055791408663622371L;
+
+    @ApiModelProperty("sid")
+    private String sid;
+    @ApiModelProperty("车辆sid")
+    private String carSid;
+    @ApiModelProperty("状态值")
+    private String key;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppFinCollectionConfirmationFeign.java

@@ -33,6 +33,7 @@ import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -65,20 +66,20 @@ public interface AppFinCollectionConfirmationFeign {
     public ResultBean addCollectionConfirm(@RequestBody ConfirmationDto dto);
 
     @ApiOperation("手机端—初始化收款确认申请")
-    @GetMapping("/initCollectionConfirm/{collectionBillSid}/{userSid}")
-    public ResultBean<ConfirmationInitVo> initCollectionConfirm(@PathVariable("collectionBillSid") String collectionBillSid, @PathVariable("userSid") String userSid);
+    @GetMapping("/initCollectionConfirm")
+    public ResultBean<ConfirmationInitVo> initCollectionConfirm(@SpringQueryMap CollectionConfirmationOrgPathQuery query);
 
     @ApiOperation("手机端—款项确认申请详情")
-    @GetMapping("/getCollectionConfirmDetail/{collectionBillSid}")
-    public ResultBean<ConfirmationDetailedVo> getCollectionConfirmDetail(@PathVariable("collectionBillSid") String collectionBillSid);
+    @GetMapping("/getCollectionConfirmDetail")
+    public ResultBean<ConfirmationDetailedVo> getCollectionConfirmDetail(@SpringQueryMap CollectionConfirmationOrgPathQuery query);
 
     @ApiOperation("手机端—提交款项确认申请")
     @PostMapping("/submitCollectionConfirm")
     public ResultBean submitCollectionConfirm(@RequestBody ConfirmationDto dto);
 
     @ApiOperation("手机端—删除收款确认单")
-    @DeleteMapping("/deleteCollectionConfirm/{collectionBillSid}")
-    public ResultBean deleteCollectionConfirm(@PathVariable("collectionBillSid") String collectionBillSid);
+    @DeleteMapping("/deleteCollectionConfirm")
+    public ResultBean deleteCollectionConfirm(@SpringQueryMap CollectionConfirmationOrgPathQuery query);
 
     @ApiOperation("手机端—查询可使用款项明细列表")
     @PostMapping("/getPaymentDetailsList")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppFinCollectionConfirmationFeignFallback.java

@@ -60,12 +60,12 @@ public class AppFinCollectionConfirmationFeignFallback implements AppFinCollecti
 	}
 
 	@Override
-	public ResultBean<ConfirmationInitVo> initCollectionConfirm(String collectionBillSid, String userSid) {
+	public ResultBean<ConfirmationInitVo> initCollectionConfirm(CollectionConfirmationOrgPathQuery query) {
 		return null;
 	}
 
 	@Override
-	public ResultBean<ConfirmationDetailedVo> getCollectionConfirmDetail(String collectionBillSid) {
+	public ResultBean<ConfirmationDetailedVo> getCollectionConfirmDetail(CollectionConfirmationOrgPathQuery query) {
 		return null;
 	}
 
@@ -75,7 +75,7 @@ public class AppFinCollectionConfirmationFeignFallback implements AppFinCollecti
 	}
 
 	@Override
-	public ResultBean deleteCollectionConfirm(String collectionBillSid) {
+	public ResultBean deleteCollectionConfirm(CollectionConfirmationOrgPathQuery query) {
 		return null;
 	}