Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoverQuery.java

@@ -15,9 +15,11 @@ public class AppBusDiscountpackageHandoverQuery implements Query {
     private String orgPath; // 分公司sid
     @ApiModelProperty("当前登录用户sid")
     private String userSid; //
-    @ApiModelProperty("待接收销售专员用户sid")
-    private String recUserSid; // 待接收销售专员用户sid
+//    @ApiModelProperty("待接收销售专员用户sid")
+//    private String recUserSid; // 待接收销售专员用户sid
     @ApiModelProperty("1待准备 2待交接 3已交接")
     private String type; // 1待准备 2待交接 3已交接
+    @ApiModelProperty("1待准备 2待交接 3已交接")
+    private String names; // 1待准备 2待交接 3已交接
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoverVo.java

@@ -32,7 +32,7 @@ public class AppBusDiscountpackageHandoverVo implements Vo {
     @ApiModelProperty("车型名称")
     private String model; // 车型名称
     @ApiModelProperty("车辆台数")
-    private String carNun; // 车辆台数
+    private String carNum; // 车辆台数
     @ApiModelProperty("接收人姓名")
     private String recName; // 接收人姓名
     @ApiModelProperty("接收人电话")

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverMapper.xml

@@ -30,7 +30,7 @@
         contractNo as contractId,
         customerName,
         vehModel as model,
-        vehCount as carNun,
+        vehCount as carNum,
         recName,
         recPhone,
         recTime

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java

@@ -495,8 +495,8 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
         QueryWrapper<BusDiscountpackageHandover> qw = new QueryWrapper<>();
         qw.eq("useOrgSid", query.getOrgPath());
         qw.eq("isDelete", 0);
-        if (StringUtils.isNotBlank(query.getRecUserSid())) {
-            qw.eq("recUserSid", query.getRecUserSid());
+        if (StringUtils.isNotBlank(query.getUserSid())) {
+            qw.eq("recUserSid", query.getUserSid());
         }
         if (StringUtils.isNotBlank(query.getType())) {
             if (query.getType().equals("3")) {
@@ -505,6 +505,10 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
                 qw.ne("state", 3);
             }
         }
+        if (StringUtils.isNotBlank(query.getNames())) {
+            qw.and(wrapper -> wrapper.like("contractNo", query.getNames()).or().like("customerName", query.getNames())
+            .or().like("recName",query.getNames()));
+        }
         return qw;
     }
 
@@ -517,9 +521,6 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
     public PagerVo<AppBusDiscountpackageHandoverVo> getDiscountHandoverList(PagerQuery<AppBusDiscountpackageHandoverQuery> pq) {
         //从传入参数中取查询条件
         AppBusDiscountpackageHandoverQuery query = pq.getParams();
-        //取到当前登录用户的sid
-        String userSid = query.getUserSid();
-        query.setRecUserSid(userSid);
         QueryWrapper<BusDiscountpackageHandover> qw = appCreateQueryWrapper(query);
         IPage<BusDiscountpackageHandover> page = PagerUtil.queryToPage(pq);
         IPage<AppBusDiscountpackageHandoverVo> pagging = baseMapper.selectAppPageVo(page, qw);
@@ -528,8 +529,13 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
             for (AppBusDiscountpackageHandoverVo record : records) {
                 if (null != record) {
                     if (StringUtils.isNotBlank(record.getContractId())) {
-                        String busSid = commonContractFeign.selectByNo(record.getContractId()).getData().getBusSid();
-                        record.setSalesOrderSid(busSid);
+
+                        CommonContract data = commonContractFeign.selectByNo(record.getContractId()).getData();
+                        if (null != data) {
+                            if (StringUtils.isNotBlank(data.getBusSid())) {
+                                record.setSalesOrderSid(data.getBusSid());
+                            }
+                        }
                     }
                     if (null != record.getType()) {
                         if (record.getType() == 1 || record.getType() == 2) {

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

@@ -455,6 +455,7 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus
             for (BusVehicleInformation information : informations) {
                 BusVehicleInformationVo informationVo = new BusVehicleInformationVo();
                 BeanUtil.copyProperties(information, informationVo);
+                informationVo.setInformationSid(information.getSid());
                 voList.add(informationVo);
             }
         }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppBusDiscountpackageHandoversQuery.java

@@ -16,9 +16,10 @@ public class AppBusDiscountpackageHandoversQuery implements Query {
     private String orgPath; // 分公司sid
     @ApiModelProperty("当前登录用户sid")
     private String userSid; //
-    @ApiModelProperty("待接收销售专员用户sid")
-    private String recUserSid; // 待接收销售专员用户sid
     @ApiModelProperty("1待准备 2待交接 3已交接")
     private String type; // 1待准备 2待交接 3已交接
+    @ApiModelProperty("合同编号/客户名称/待接收人")
+    private String names;
+
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppBusDiscountpackageHandoversVo.java

@@ -32,7 +32,7 @@ public class AppBusDiscountpackageHandoversVo implements Vo {
     @ApiModelProperty("车型名称")
     private String model; // 车型名称
     @ApiModelProperty("车辆台数")
-    private String carNun; // 车辆台数
+    private String carNum; // 车辆台数
     @ApiModelProperty("接收人姓名")
     private String recName; // 接收人姓名
     @ApiModelProperty("接收人电话")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppDiscountPackageHandoverFegin.java

@@ -46,4 +46,5 @@ public interface AppDiscountPackageHandoverFegin {
     @ResponseBody
     public ResultBean uploadPicture(@RequestBody AppBusDiscountpackageHandoversDto dto) throws InvocationTargetException, IllegalAccessException;
 
+
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/AppVehicleInformationDto.java

@@ -4,6 +4,8 @@ import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @author Administrator
  * @description
@@ -12,27 +14,33 @@ import lombok.Data;
 @Data
 public class AppVehicleInformationDto implements Dto {
     @ApiModelProperty("车钥匙个数")
-    private Integer vehicleKeyNum; // 车钥匙个数
-//    @ApiModelProperty("发票0无1有")
-//    private Integer invoice; // 发票
-//    @ApiModelProperty("合格证0无1有")
-//    private Integer credential; // 合格证0无1有
+    private String vehicleKeyNum; // 车钥匙个数
     @ApiModelProperty("一致性证书0无1有")
-    private Integer certificate; // 一致性证书0无1有
+    private String certificate; // 一致性证书0无1有
     @ApiModelProperty("申请表0无1有")
-    private Integer applyForm; // 申请表0无1有
+    private String applyForm; // 申请表0无1有
     @ApiModelProperty("保修手册、说明书0无1有")
-    private Integer manual; // 保修手册、说明书0无1有
+    private String manual; // 保修手册、说明书0无1有
     @ApiModelProperty("环保清单0无1有")
-    private Integer environmentalList; // 环保清单0无1有
+    private String environmentalList; // 环保清单0无1有
     @ApiModelProperty("驾驶员卡0无1有")
-    private Integer dirverCard; // 驾驶员卡0无1有
+    private String dirverCard; // 驾驶员卡0无1有
     @ApiModelProperty("气瓶产品质量证明书（燃气车）0无1有")
-    private Integer gasCertificate; // 气瓶产品质量证明书（燃气车）0无1有
+    private String gasCertificate; // 气瓶产品质量证明书（燃气车）0无1有
     @ApiModelProperty("随车资料交接表sid")
     private String handoverSid; // 随车资料交接表sid
     @ApiModelProperty("交接次数")
-    private Integer handoverNum; // 交接次数
+    private String handoverNum; // 交接次数
     @ApiModelProperty("是否是燃气车 0不是1是")
-    private Integer isFuelVehicle; // 是否是燃气车 0不是1是
+    private String isFuelVehicle; // 是否是燃气车 0不是1是
+    @ApiModelProperty("接收人")
+    private String recName; // 接收人
+    @ApiModelProperty("接收时间")
+    private Date recTime; // 接收时间
+    @ApiModelProperty("移交人")
+    private String transferName; // 移交人
+    @ApiModelProperty("备注信息")
+    private String remarks;
+    @ApiModelProperty("随车资料")
+    private String vehicleHandoverData; //剩余随车资料
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/AppVehicleInformationHandoverDetailsListVo.java

@@ -0,0 +1,31 @@
+package com.yxt.anrui.terminal.api.autoservice.vehicleinformationhandover;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/5/29 15:17
+ */
+@Data
+public class AppVehicleInformationHandoverDetailsListVo implements Vo {
+    private String sid;
+    @ApiModelProperty("车辆sid")
+    private String vehicleSid; // 车辆sid
+    @ApiModelProperty("是否是燃气车 0不是1是")
+    private String isFuelVehicle; // 是否是燃气车 0不是1是
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("车型")
+    private String model;
+    @ApiModelProperty("合同号")
+    private String contractNo;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("随车资料")
+    private List<AppVehicleInformationVo> informations;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/AppVehicleInformationHandoverDetailsVo.java

@@ -15,10 +15,11 @@ import java.util.Date;
  */
 @Data
 public class AppVehicleInformationHandoverDetailsVo implements Vo {
-
     private String sid;
     @ApiModelProperty("车辆sid")
     private String vehicleSid; // 车辆sid
+    @ApiModelProperty("是否是燃气车 0不是1是")
+    private String isFuelVehicle; // 是否是燃气车 0不是1是
     @ApiModelProperty("车架号")
     private String vinNo;
     @ApiModelProperty("车型")
@@ -29,11 +30,6 @@ public class AppVehicleInformationHandoverDetailsVo implements Vo {
     private String customerName;
     @ApiModelProperty("接收人")
     private String recName; // 接收人
-    @ApiModelProperty("接收日期")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date recTime;
     @ApiModelProperty("随车资料")
     private AppVehicleInformationVo busVehicleInformation;
-    @ApiModelProperty("备注信息")
-    private String remarks;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/AppVehicleInformationHandoverDto.java

@@ -16,16 +16,18 @@ public class AppVehicleInformationHandoverDto implements Dto {
     private String sid;
     @ApiModelProperty("交接状态")
     private Integer handoverState; // 交接状态
+    @ApiModelProperty("创建人sid")
+    private String createBySid; // 创建人sid
     @ApiModelProperty("车架号")
     private String vinNo; // 车架号
     @ApiModelProperty("车辆sid")
     private String vehicleSid; // 车辆sid
-    @ApiModelProperty("创建人sid")
-    private String createBySid; // 创建人sid
     @ApiModelProperty("客户名称")
     private String customerName; // 客户名称
     @ApiModelProperty("车型名")
     private String model; // 车型名
+    @ApiModelProperty("车型sid")
+    private String modelSid;
     @ApiModelProperty("合同号")
     private String contractNo; // 合同号
     @ApiModelProperty("接收人")
@@ -38,10 +40,9 @@ public class AppVehicleInformationHandoverDto implements Dto {
     private String useOrgName;
     @ApiModelProperty("关联业务sid")
     private String busSid;
-    @ApiModelProperty("接收日期")
-    private Date recTime;
+    @ApiModelProperty("是否是燃气车 0不是1是")
+    private Integer isFuelVehicle; // 是否是燃气车 0不是1是
     @ApiModelProperty("随车资料")
     private AppVehicleInformationDto busVehicleInformation;
-    @ApiModelProperty("备注信息")
-    private String remarks;
+
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/AppVehicleInformationVo.java

@@ -1,9 +1,12 @@
 package com.yxt.anrui.terminal.api.autoservice.vehicleinformationhandover;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @author Administrator
  * @description
@@ -11,12 +14,11 @@ import lombok.Data;
  */
 @Data
 public class AppVehicleInformationVo implements Vo {
+    private String informationSid;
     @ApiModelProperty("车钥匙个数")
     private String vehicleKeyNum; // 车钥匙个数
-    //    @ApiModelProperty("发票0无1有")
-//    private Integer invoice; // 发票
     @ApiModelProperty("一致性证书0无1有")
-    private Integer certificate; // 一致性证书0无1有
+    private String certificate; // 一致性证书0无1有
     @ApiModelProperty("申请表0无1有")
     private String applyForm; // 申请表0无1有
     @ApiModelProperty("保修手册、说明书0无1有")
@@ -27,4 +29,15 @@ public class AppVehicleInformationVo implements Vo {
     private String dirverCard; // 驾驶员卡0无1有
     @ApiModelProperty("气瓶产品质量证明书（燃气车）0无1有")
     private String gasCertificate; // 气瓶产品质量证明书（燃气车）0无1有
+    @ApiModelProperty("接收人")
+    private String recName; // 接收人
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty("接收时间")
+    private Date recTime; // 接收时间
+    @ApiModelProperty("移交人")
+    private String transferName; // 移交人
+    @ApiModelProperty("备注信息")
+    private String remarks;
+    @ApiModelProperty("剩余随车资料")
+    private String vehicleHandoverData; //剩余随车资料
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehicleInformationHandoverFeign.java

@@ -34,10 +34,17 @@ public interface VehicleInformationHandoverFeign {
     @ResponseBody
     public ResultBean appSaveOrUpdate(@RequestBody AppVehicleInformationHandoverDto dto);
 
-    @ApiOperation("根据SID获取一条记录")
-    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ApiOperation("编辑回显")
+    @GetMapping("/fetchDetailsBySid/{sid}/{times}")
     @ResponseBody
-    public ResultBean<AppVehicleInformationHandoverDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+    public ResultBean<AppVehicleInformationHandoverDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid,@PathVariable("times") String times);
+
+
+    @ApiOperation("随车资料交接详情")
+    @GetMapping("details/{sid}")
+    @ResponseBody
+    public ResultBean<AppVehicleInformationHandoverDetailsListVo> details(@PathVariable("sid") String sid);
+
 
     @ApiOperation("根据创建人sid查询合同用于交车资料查询")
     @ResponseBody
@@ -45,16 +52,13 @@ public interface VehicleInformationHandoverFeign {
     public ResultBean<List<AppContractBusVechileDataHandoverVo>> contractForHandover(@RequestBody PagerQuery<AppContractBusVechileDataHandoverQuery> pq);
 
 
+
     @ApiOperation("对外二次交付新增或修改交车资料管理")
     @PostMapping("/saveVehicleData")
     @ResponseBody
     public ResultBean<String> saveVehicleData(@RequestBody AppVehicleDataHandoverDto dto);
 
 
-//    @ApiOperation("对外二次交付查看交车资料确认单详情")
-//    @GetMapping("/fetchVehicleDataBySid/{sid}")
-//    @ResponseBody
-//    public ResultBean<AppVehicleDataHandoverDetailsVo> fetchVehicleDataBySid(@PathVariable("sid") String sid);
 
     @ApiOperation(("打印交车资料确认单"))
     @PostMapping("/createPdf")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehicleInformationHandoverFeignFallback.java

@@ -25,7 +25,12 @@ public class VehicleInformationHandoverFeignFallback implements VehicleInformati
     }
 
     @Override
-    public ResultBean<AppVehicleInformationHandoverDetailsVo> fetchDetailsBySid(String sid) {
+    public ResultBean<AppVehicleInformationHandoverDetailsVo> fetchDetailsBySid(String sid,String times) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<AppVehicleInformationHandoverDetailsListVo> details(String sid) {
         return null;
     }
 

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageHandover/AppDiscountPackageHandoverService.java

@@ -43,14 +43,15 @@ public class AppDiscountPackageHandoverService {
      */
     public ResultBean<PagerVo<AppBusDiscountpackageHandoversVo>> listPage(PagerQuery<AppBusDiscountpackageHandoversQuery> pagerQuery) {
         ResultBean<PagerVo<AppBusDiscountpackageHandoversVo>> rb = ResultBean.fireFail();
-        PagerQuery<AppBusDiscountpackageHandoverQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
-        ResultBean<PagerVo<AppBusDiscountpackageHandoverVo>> resultBean = busDiscountpackageHandoverFeign.getDiscountHandoverList(pq);
-        System.out.println(resultBean.getData().getRecords());
-        List<AppBusDiscountpackageHandoversVo> voList = Optional.ofNullable(resultBean.getData().getRecords()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AppBusDiscountpackageHandoversVo.class)).collect(Collectors.toList());
-        PagerVo<AppBusDiscountpackageHandoversVo> v = new PagerVo<>();
-        BeanUtil.copyProperties(resultBean.getData(), v);
-        v.setRecords(voList);
-        return rb.success().setData(v);
+        PagerQuery<AppBusDiscountpackageHandoverQuery> pq = new PagerQuery<>();
+        BeanUtil.copyProperties(pagerQuery,pq);
+        ResultBean<PagerVo<AppBusDiscountpackageHandoverVo>> voResultBean = busDiscountpackageHandoverFeign.getDiscountHandoverList(pq);
+        PagerVo<AppBusDiscountpackageHandoversVo> vo = new PagerVo<>();
+        if (voResultBean.getSuccess()) {
+            PagerVo<AppBusDiscountpackageHandoverVo> data = voResultBean.getData();
+            BeanUtil.copyProperties(data,vo);
+        }
+        return rb.success().setData(vo);
     }
 
 

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/vehicleinformationhandover/VehicleInformationHandoverRest.java

@@ -36,14 +36,14 @@ public class VehicleInformationHandoverRest implements VehicleInformationHandove
     }
 
     @Override
-    public ResultBean<AppVehicleInformationHandoverDetailsVo> fetchDetailsBySid(String sid) {
-        return null;
+    public ResultBean<AppVehicleInformationHandoverDetailsVo> fetchDetailsBySid(String sid, String times) {
+        return vehicleInformationHandoverService.fetchDetailsBySid(sid,times);
     }
 
-//    @Override
-//    public ResultBean<AppVehicleInformationHandoverDetailsVo> fetchDetailsBySid(String sid) {
-//        return vehicleInformationHandoverService.fetchDetailsBySid(sid);
-//    }
+    @Override
+    public ResultBean<AppVehicleInformationHandoverDetailsListVo> details(String sid) {
+        return vehicleInformationHandoverService.details(sid);
+    }
 
     @Override
     public ResultBean<List<AppContractBusVechileDataHandoverVo>> contractForHandover(PagerQuery<AppContractBusVechileDataHandoverQuery> pq) {

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/vehicleinformationhandover/VehicleInformationHandoverService.java

@@ -45,19 +45,9 @@ public class VehicleInformationHandoverService {
         PagerQuery<BusVehicleInformationHandoverQuery> pagerQuery = new PagerQuery<>();
         BeanUtil.copyProperties(pq, pagerQuery);
         PagerVo<BusVehicleInformationHandoverVo> data = busVehicleInformationHandoverFeign.listPage(pagerQuery).getData();
-        List<AppVehicleInformationHandoverVo> vos = new ArrayList<>();
         PagerVo<AppVehicleInformationHandoverVo> pagerVo = new PagerVo<>();
         if (null != data) {
-            if (null != data.getRecords()) {
-                List<BusVehicleInformationHandoverVo> records = data.getRecords();
-                for (BusVehicleInformationHandoverVo record : records) {
-                    AppVehicleInformationHandoverVo vo = new AppVehicleInformationHandoverVo();
-                    BeanUtil.copyProperties(record, vo);
-                    vos.add(vo);
-                }
-            }
-            BeanUtil.copyProperties(data, pagerVo);
-            pagerVo.setRecords(vos);
+            BeanUtil.copyProperties(data,pagerVo);
         }
         return rb.success().setData(pagerVo);
     }
@@ -192,4 +182,37 @@ public class VehicleInformationHandoverService {
         BeanUtil.copyProperties(data,pagerVo);
         return rb.success().setData(pagerVo);
     }
+
+    /**
+     * 移动端随车资料内部交接编辑回显
+     * @param sid
+     * @param times
+     * @return
+     */
+    public ResultBean<AppVehicleInformationHandoverDetailsVo> fetchDetailsBySid(String sid, String times) {
+        ResultBean rb = ResultBean.fireFail();
+        ResultBean<BusVehicleInformationHandoverDetailsVo> voResultBean = busVehicleInformationHandoverFeign.fetchDetailsBySid(sid, times);
+        AppVehicleInformationHandoverDetailsVo vo = new AppVehicleInformationHandoverDetailsVo();
+        if (voResultBean.getSuccess()) {
+            BusVehicleInformationHandoverDetailsVo data = voResultBean.getData();
+            BeanUtil.copyProperties(data,vo);
+        }
+        return rb.success().setData(vo);
+    }
+
+    /**
+     * 随车资料交接详情
+     * @param sid
+     * @return
+     */
+    public ResultBean<AppVehicleInformationHandoverDetailsListVo> details(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        ResultBean<BusVehicleInformationHandoverDetailsListVo> voResultBean = busVehicleInformationHandoverFeign.details(sid);
+        AppVehicleInformationHandoverDetailsListVo vo = new AppVehicleInformationHandoverDetailsListVo();
+        if (voResultBean.getSuccess()) {
+            BusVehicleInformationHandoverDetailsListVo data = voResultBean.getData();
+            BeanUtil.copyProperties(data,vo);
+        }
+        return rb.success().setData(vo);
+    }
 }