交车准备获取随车资料信息

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

@@ -36,19 +36,9 @@ 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 = "交车准备-申请表")
+@Api(tags = "交车准备")
 @FeignClient(
         contextId = "anrui-buscenter-handover-BusHandoverPrepare",
         name = "anrui-buscenter",
@@ -99,22 +89,22 @@ public interface BusHandoverPrepareFeign {
     @ResponseBody
     ResultBean<AppBusHandoverPrepareInfoVo> getDeliveryPlanInfo(@SpringQueryMap AppBusHandoverPrepareInfoQuery query);
 
-    @ApiOperation("修改交车准备 各资料状态修改")
+/*    @ApiOperation("修改交车准备 各资料状态修改")
     @PutMapping("/saveState")
     @ResponseBody
-    ResultBean saveState(@RequestBody AppStateDateDto dto);
+    ResultBean saveState(@RequestBody AppStateDateDto dto);*/
 
-    @ApiOperation("获取交车准备 发票信息")
+    @ApiOperation("交车准备的发票信息")
     @GetMapping("/getInvoiceInfo")
     @ResponseBody
     ResultBean<AppInvoicingInfoVo> getInvoiceInfo(@SpringQueryMap AppInvoicingInfoQuery query);
 
-    @ApiOperation("获取交车准备 合格证信息")
+    @ApiOperation("交车准备的合格证信息")
     @GetMapping("/getCertificateInfo")
     @ResponseBody
     ResultBean<AppCertificateInfoVo> getCertificateInfo(@SpringQueryMap AppCertificateInfoQuery query);
 
-    @ApiOperation("获取交车准备 保单信息")
+    @ApiOperation("交车准备的保单信息")
     @GetMapping("/getPolicyInfo")
     @ResponseBody
     ResultBean<AppPolicyInfoVo> getPolicyInfo(@SpringQueryMap AppPolicyInfoQuery query);
@@ -124,7 +114,7 @@ public interface BusHandoverPrepareFeign {
     @ResponseBody
     ResultBean savePolicyInfo(@RequestBody AppPolicyDto dto);
 
-    @ApiOperation("获取交车准备 其他资料信息")
+    @ApiOperation("交车准备的其他资料信息")
     @GetMapping("/getOtherDataInfo")
     @ResponseBody
     ResultBean<AppOtherDataInfoVo> getOtherDataInfo(@SpringQueryMap AppOtherDataInfoQuery query);
@@ -149,4 +139,9 @@ public interface BusHandoverPrepareFeign {
     @ResponseBody
     ResultBean submitDeliveryPlanInfo(@RequestBody AppSubmitHandoverPrepareDto dto);
 
+    @ApiOperation("交车准备的随车资料信息")
+    @GetMapping("/getVehicleInformationInfo")
+    @ResponseBody
+    ResultBean<HandoverInformationVo> getVehicleInformationInfo(@RequestParam("sid") String sid);
+
 }

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

@@ -84,10 +84,10 @@ public class BusHandoverPrepareFeignFallback implements BusHandoverPrepareFeign
 		return null;
 	}
 
-	@Override
+	/*@Override
 	public ResultBean saveState(AppStateDateDto dto) {
 		return null;
-	}
+	}*/
 
 	@Override
 	public ResultBean<AppInvoicingInfoVo> getInvoiceInfo(AppInvoicingInfoQuery query) {
@@ -133,4 +133,9 @@ public class BusHandoverPrepareFeignFallback implements BusHandoverPrepareFeign
 	public ResultBean submitDeliveryPlanInfo(AppSubmitHandoverPrepareDto dto) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<HandoverInformationVo> getVehicleInformationInfo(String sid) {
+		return null;
+	}
 }

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

@@ -0,0 +1,21 @@
+package com.yxt.anrui.buscenter.api.bushandoverprepare;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description: 随车资料交接
+ * @author: dimengzhe
+ * @date: 2023/5/30
+ **/
+@Data
+public class HandoverInformationIntemVo {
+
+    @ApiModelProperty("随车资料")
+    private String vehicleHandoverData;
+    @ApiModelProperty("接收人")
+    private String recName;
+    @ApiModelProperty("移交人")
+    private String transferName;
+
+}

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

@@ -0,0 +1,28 @@
+package com.yxt.anrui.buscenter.api.bushandoverprepare;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description: 交车准备随车资料
+ * @author: dimengzhe
+ * @date: 2023/5/30
+ **/
+@Data
+public class HandoverInformationVo {
+
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("车型名称")
+    private String model;
+    @ApiModelProperty("合同编号")
+    private String contractNo;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("交接记录")
+    private List<HandoverInformationIntemVo> itemList = new ArrayList<>();
+
+}

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

@@ -26,6 +26,7 @@
 package com.yxt.anrui.buscenter.biz.bushandoverprepare;
 
 import com.yxt.anrui.buscenter.api.bushandoverprepare.BusHandoverPrepareFeign;
+import com.yxt.anrui.buscenter.api.bushandoverprepare.HandoverInformationVo;
 import com.yxt.anrui.buscenter.api.bushandoverprepare.app.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -113,10 +114,10 @@ public class BusHandoverPrepareRest implements BusHandoverPrepareFeign {
         return busHandoverPrepareService.getDeliveryPlanInfo(query);
     }
 
-    @Override
+   /* @Override
     public ResultBean saveState(AppStateDateDto dto) {
         return busHandoverPrepareService.saveState(dto);
-    }
+    }*/
 
     @Override
     public ResultBean<AppInvoicingInfoVo> getInvoiceInfo(AppInvoicingInfoQuery query) {
@@ -162,4 +163,9 @@ public class BusHandoverPrepareRest implements BusHandoverPrepareFeign {
     public ResultBean submitDeliveryPlanInfo(AppSubmitHandoverPrepareDto dto) {
         return busHandoverPrepareService.submitDeliveryPlanInfo(dto);
     }
+
+    @Override
+    public ResultBean<HandoverInformationVo> getVehicleInformationInfo(String sid) {
+        return busHandoverPrepareService.getVehicleInformationInfo(sid);
+    }
 }

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

@@ -36,14 +36,19 @@ import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFile;
 import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFileEnum;
 import com.yxt.anrui.buscenter.api.bushandoverprepare.BusHandoverPrepare;
 import com.yxt.anrui.buscenter.api.bushandoverprepare.BusHandoverPrepareAddDto;
+import com.yxt.anrui.buscenter.api.bushandoverprepare.HandoverInformationIntemVo;
+import com.yxt.anrui.buscenter.api.bushandoverprepare.HandoverInformationVo;
 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.api.bushandoverwait.BusHandoverWaitDto;
+import com.yxt.anrui.buscenter.api.busvehicleinformationhandover.BusVehicleInformationHandover;
 import com.yxt.anrui.buscenter.biz.buscenterfile.BuscenterFileService;
 import com.yxt.anrui.buscenter.biz.bushandoverpreparevehicle.BusHandoverPrepareVehicleService;
 import com.yxt.anrui.buscenter.biz.bushandoverwait.BusHandoverWaitService;
+import com.yxt.anrui.buscenter.biz.busvehicleinformation.BusVehicleInformationService;
+import com.yxt.anrui.buscenter.biz.busvehicleinformationhandover.BusVehicleInformationHandoverService;
 import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleFeign;
 import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceFeign;
 import com.yxt.anrui.fin.api.finvehicleinvoice.VehicleInvoiceVo;
@@ -99,6 +104,10 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
     private SysUserFeign sysUserFeign;
     @Autowired
     private FinVehicleInvoiceFeign finVehicleInvoiceFeign;
+    @Autowired
+    private BusVehicleInformationHandoverService busVehicleInformationHandoverService;
+    @Autowired
+    private BusVehicleInformationService busVehicleInformationService;
 
    /* private QueryWrapper<BusHandoverPrepare> createQueryWrapper(BusHandoverPrepareQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -279,11 +288,11 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
      * @param dto
      * @return
      */
-    public ResultBean saveState(AppStateDateDto dto) {
+   /* public ResultBean saveState(AppStateDateDto dto) {
         ResultBean rb = ResultBean.fireFail();
         busHandoverPrepareVehicleService.saveState(dto);
         return rb.success();
-    }
+    }*/
 
     /**
      * 获取交车准备 发票信息
@@ -488,4 +497,22 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
         updateById(busHandoverPrepare);
         return rb.success();
     }
+
+    public ResultBean<HandoverInformationVo> getVehicleInformationInfo(String sid) {
+        ResultBean<HandoverInformationVo> rb = ResultBean.fireFail();
+        HandoverInformationVo handoverInformationVo = new HandoverInformationVo();
+        BusHandoverPrepareVehicle busHandoverPrepareVehicle = busHandoverPrepareVehicleService.fetchBySid(sid);
+        BusVehicleInformationHandover busVehicleInformationHandover = busVehicleInformationHandoverService.getVehicleInformationInfo(busHandoverPrepareVehicle.getVinSid());
+        if(busVehicleInformationHandover != null){
+            handoverInformationVo.setContractNo(busVehicleInformationHandover.getContractNo());
+            handoverInformationVo.setCustomerName(busVehicleInformationHandover.getCustomerName());
+            handoverInformationVo.setVinNo(busVehicleInformationHandover.getVinNo());
+            handoverInformationVo.setModel(busVehicleInformationHandover.getModel());
+            //根据随车资料主表sid查询随车资料的记录
+            List<HandoverInformationIntemVo> list = busVehicleInformationService.selectByMainSid(busVehicleInformationHandover.getSid());
+            list.removeAll(Collections.singleton(null));
+            handoverInformationVo.setItemList(list);
+        }
+        return rb.success().setData(handoverInformationVo);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationMapper.java

@@ -1,6 +1,7 @@
 package com.yxt.anrui.buscenter.biz.busvehicleinformation;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.buscenter.api.bushandoverprepare.HandoverInformationIntemVo;
 import com.yxt.anrui.buscenter.api.busvehicleinformation.BusVehicleInformation;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -17,4 +18,6 @@ public interface BusVehicleInformationMapper extends BaseMapper<BusVehicleInform
     List<BusVehicleInformation> getByHandoverSid(@Param("handoverSid") String handoverSid);
 
     BusVehicleInformation selectByHandoverNumAndHandoverSid(@Param("handoverNum")String handoverNum, @Param("sid")String sid);
+
+    List<HandoverInformationIntemVo> selectByMainSid(String sid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationMapper.xml

@@ -19,4 +19,8 @@
           and handoverSid = #{sid}
 
     </select>
+
+    <select id="selectByMainSid" resultType="com.yxt.anrui.buscenter.api.bushandoverprepare.HandoverInformationIntemVo">
+        select vehicleHandoverData,recName,transferName from bus_vehicle_information where handoverSid = #{sid}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationService.java

@@ -1,8 +1,8 @@
 package com.yxt.anrui.buscenter.biz.busvehicleinformation;
 
+import com.yxt.anrui.buscenter.api.bushandoverprepare.HandoverInformationIntemVo;
 import com.yxt.anrui.buscenter.api.busvehicleinformation.BusVehicleInformation;
 import com.yxt.common.base.service.MybatisBaseService;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -22,4 +22,8 @@ public class BusVehicleInformationService extends MybatisBaseService<BusVehicleI
     public BusVehicleInformation selectByHandoverNumAndHandoverSid(String handoverNum, String sid) {
         return baseMapper.selectByHandoverNumAndHandoverSid(handoverNum,sid);
     }
+
+    public List<HandoverInformationIntemVo> selectByMainSid(String sid) {
+        return baseMapper.selectByMainSid(sid);
+    }
 }

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

@@ -19,4 +19,6 @@ public interface BusVehicleInformationHandoverMapper extends BaseMapper<BusVehic
     IPage<BusVehicleInformationHandoverVo> selectPageVo(IPage<BusVehicleInformationHandover> page, @Param(Constants.WRAPPER) QueryWrapper<BusVehicleInformationHandover> qw);
 
     BusVehicleInformationHandover selectByVehicleSid(@Param("vehicleSid") String vehicleSid);
+
+    BusVehicleInformationHandover getVehicleInformationInfo(String sid);
 }

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

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

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

@@ -4,14 +4,12 @@ package com.yxt.anrui.buscenter.biz.busvehicleinformationhandover;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
 import com.yxt.anrui.buscenter.api.busvehicleinformation.BusVehicleInformation;
 import com.yxt.anrui.buscenter.api.busvehicleinformation.BusVehicleInformationDto;
 import com.yxt.anrui.buscenter.api.busvehicleinformation.BusVehicleInformationVo;
 import com.yxt.anrui.buscenter.api.busvehicleinformationhandover.*;
-
 import com.yxt.anrui.buscenter.biz.busvehicleinformation.BusVehicleInformationService;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -23,7 +21,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -462,4 +459,8 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus
         vo.setInformations(voList);
         return rb.success().setData(vo);
     }
+
+    public BusVehicleInformationHandover getVehicleInformationInfo(String sid) {
+        return baseMapper.getVehicleInformationInfo(sid);
+    }
 }

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

@@ -65,11 +65,11 @@ public interface AppBusHandoverPrepareFeign {
     @ResponseBody
     ResultBean<HandoverPrepareInfoVo> getDeliveryPlanInfo(@SpringQueryMap HandoverPrepareInfoQuery query);
 
-    @ApiOperation("修改交车准备 其他资料信息")
+   /* @ApiOperation("修改交车准备 其他资料信息")
     @PutMapping("/saveState")
     @ResponseBody
     ResultBean saveState(@RequestBody StateDateDto dto);
-
+*/
     @ApiOperation("获取交车准备 发票信息")
     @GetMapping("/getInvoiceInfo")
     @ResponseBody

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

@@ -57,10 +57,10 @@ public class AppBusHandoverPrepareFeignFallback implements AppBusHandoverPrepare
         return null;
     }
 
-    @Override
+   /* @Override
     public ResultBean saveState(StateDateDto dto) {
         return null;
-    }
+    }*/
 
     @Override
     public ResultBean<InvoicingInfoVo> getInvoiceInfo(InvoicingInfoQuery query) {

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/deliveryPlan/AppBusHandoverPrepareRest.java

@@ -25,15 +25,14 @@
  *********************************************************/
 package com.yxt.anrui.terminal.biz.autoservice.deliveryPlan;
 
-import com.yxt.anrui.buscenter.api.bushandoverprepare.*;
 import 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 io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * Project: bus_handover(交车准备) <br/>
@@ -66,10 +65,10 @@ public class AppBusHandoverPrepareRest implements AppBusHandoverPrepareFeign {
         return appBusHandoverPrepareService.getDeliveryPlanInfo(query);
     }
 
-    @Override
+   /* @Override
     public ResultBean saveState(StateDateDto dto) {
         return appBusHandoverPrepareService.saveState(dto);
-    }
+    }*/
 
     @Override
     public ResultBean<InvoicingInfoVo> getInvoiceInfo(InvoicingInfoQuery query) {

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/deliveryPlan/AppBusHandoverPrepareService.java

@@ -88,13 +88,13 @@ public class AppBusHandoverPrepareService {
         return rb.success().setData(vo);
     }
 
-    public ResultBean saveState(StateDateDto dto) {
+ /*   public ResultBean saveState(StateDateDto dto) {
         AppStateDateDto appStateDateDto = new AppStateDateDto();
         BeanUtil.copyProperties(dto, appStateDateDto);
         ResultBean resultBean = busHandoverPrepareFeign.saveState(appStateDateDto);
         return resultBean;
     }
-
+*/
     public ResultBean<InvoicingInfoVo> getInvoiceInfo(InvoicingInfoQuery query) {
         ResultBean<InvoicingInfoVo> rb = ResultBean.fireFail();
         InvoicingInfoVo vo = new InvoicingInfoVo();