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

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

@@ -46,4 +46,6 @@ public class BusHandoverPrepareAddDto implements Dto {
 
     private String model;
 
+
+
 }

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

@@ -144,4 +144,9 @@ public interface BusHandoverPrepareFeign {
     @ResponseBody
     ResultBean<HandoverInformationVo> getVehicleInformationInfo(@RequestParam("sid") String sid);
 
+    @ApiOperation("随车资料确认")
+    @PostMapping("/updateVehicleInformation")
+    @ResponseBody
+    ResultBean updateVehicleInformation(@RequestParam("sid") String sid);
+
 }

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

@@ -138,4 +138,9 @@ public class BusHandoverPrepareFeignFallback implements BusHandoverPrepareFeign
 	public ResultBean<HandoverInformationVo> getVehicleInformationInfo(String sid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean updateVehicleInformation(String sid) {
+		return null;
+	}
 }

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

@@ -17,5 +17,9 @@ public class HandoverInformationIntemVo {
     private String recName;
     @ApiModelProperty("移交人")
     private String transferName;
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("交接日期")
+    private String recTime;
 
 }

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

@@ -3,6 +3,7 @@ package com.yxt.anrui.buscenter.api.bushandoverpreparevehicle;
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.omg.CORBA.PRIVATE_MEMBER;
 
 @Data
 public class AppBusHandoverPrepareVehicleDto implements Dto {
@@ -10,6 +11,7 @@ public class AppBusHandoverPrepareVehicleDto implements Dto {
 
     @ApiModelProperty("交车申请表sid")
     private String mainSid;
+    private String sid;
     @ApiModelProperty("车架号")
     private String vinNo;
     @ApiModelProperty("车辆sid")
@@ -25,4 +27,8 @@ public class AppBusHandoverPrepareVehicleDto implements Dto {
     @ApiModelProperty("其他资料")
     private boolean otherDataState;
 
+    @ApiModelProperty("业务状态")
+    private String subscription;
+    private String subscriptionKey;
+
 }

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

@@ -66,4 +66,8 @@ public class BusHandoverPrepareVehicle extends BaseEntity {
     private int onBoardDataState;
     @ApiModelProperty("其他资料状态")
     private int otherDataState;
+
+    @ApiModelProperty("业务状态")
+    private String subscription;
+    private String subscriptionKey;
 }

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

@@ -796,14 +796,14 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
         //车架号发生变化，重新生成新车买卖合同（欠款）、欠款提车担保承诺书、总经理担保承诺书、
         //回购日期发生变化，重新生成欠款提车担保承诺书
         if (StringUtils.isBlank(sid)) {
-            //生成新车买卖合同（欠款）
+           /* //生成新车买卖合同（欠款）
             carContractDownloadUrl = carContractDownloadUrl(dto, map);
             //生成欠款提车担保承诺书
             guaranteeLetterDownloadUrl = guaranteeLetterDownloadUrl(dto, map);
             //生成总经理担保书
             zjlLetterDownloadUrl = zjlLetterDownloadUrl(dto, map);
             //生成股东会对外担保决议
-            gdLetterDownloadUrl = gdLetterDownloadUrl(dto, map);
+            gdLetterDownloadUrl = gdLetterDownloadUrl(dto, map);*/
             PdfVo pdfVo = new PdfVo();
             List<File> filesList = new ArrayList<>();
             if (StringUtils.isNotBlank(carContractDownloadUrl)) {
@@ -891,13 +891,13 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
             }
             if (isChange) {
                 //生成新车买卖合同（欠款）
-                carContractDownloadUrl = carContractDownloadUrl(dto, map);
+//                carContractDownloadUrl = carContractDownloadUrl(dto, map);
                 //生成总经理担保书
-                zjlLetterDownloadUrl = zjlLetterDownloadUrl(dto, map);
+//                zjlLetterDownloadUrl = zjlLetterDownloadUrl(dto, map);
             }
             if (dateChange || isChange) {
                 //生成欠款提车担保承诺书
-                guaranteeLetterDownloadUrl = guaranteeLetterDownloadUrl(dto, map);
+//                guaranteeLetterDownloadUrl = guaranteeLetterDownloadUrl(dto, map);
             }
             //新车买卖合同（欠款）
             PdfVo pdfVo = new PdfVo();

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.java

@@ -92,4 +92,6 @@ public interface BusDeliveredMapper extends BaseMapper<BusDelivered> {
     int updateStateByContractNo(@Param("contractNo") String contractNo, @Param("list") List<String> vinSidList, @Param("state") int i);
 
     IPage<BusDeliveredVo> selectListsVo(IPage<BusDelivered> page,@Param(Constants.WRAPPER) QueryWrapper<BusDelivered> qw);
+
+    BusDelivered getState(@Param("contractNo") String contractNo, @Param("vinSid") String vinSid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml

@@ -117,4 +117,8 @@
             and length(bv.linkSid)>0
         </where>
     </select>
+
+    <select id="getState" resultType="com.yxt.anrui.buscenter.api.busdelivered.BusDelivered">
+        select * from bus_delivered where contractNo = #{contractNo} and busVinSid = #{vinSid}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java

@@ -650,4 +650,8 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
         }
         return rb.success().setData(list);
     }
+
+    public BusDelivered getState(String contractNo, String vinSid) {
+        return baseMapper.getState(contractNo,vinSid);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@@ -45,6 +45,7 @@ import com.yxt.anrui.base.api.basevehicleout.BaseVehicleZSOutDto;
 import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
 import com.yxt.anrui.base.common.utils.Rule;
 import com.yxt.anrui.buscenter.api.busdelivered.AppDeliveredDetailsVo;
+import com.yxt.anrui.buscenter.api.busdelivered.BusDelivered;
 import com.yxt.anrui.buscenter.api.busdelivered.DeliveredDictVo;
 import com.yxt.anrui.buscenter.api.busdeliveredapply.*;
 import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarListVo;
@@ -770,6 +771,11 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 AppBusHandoverPrepareVehicleDto appBusHandoverPrepareVehicleDto = new AppBusHandoverPrepareVehicleDto();
                 appBusHandoverPrepareVehicleDto.setVinNo(details.getVinNo());
                 appBusHandoverPrepareVehicleDto.setVinSid(details.getVinSid());
+                //根据合同编号和车辆sid查询
+                BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(busDeliveredApply.getContractNo(),details.getVinSid());
+                BusDelivered busDelivered = busDeliveredService.getState(busDeliveredApply.getContractNo(),busSalesOrderVehicle.getSid());
+                appBusHandoverPrepareVehicleDto.setSubscription(busDelivered.getSubscription());
+                appBusHandoverPrepareVehicleDto.setSubscriptionKey(busDelivered.getSubscriptionKey());
                 dtos.add(appBusHandoverPrepareVehicleDto);
             }
         }

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

@@ -168,4 +168,9 @@ public class BusHandoverPrepareRest implements BusHandoverPrepareFeign {
     public ResultBean<HandoverInformationVo> getVehicleInformationInfo(String sid) {
         return busHandoverPrepareService.getVehicleInformationInfo(sid);
     }
+
+    @Override
+    public ResultBean updateVehicleInformation(String sid) {
+        return busHandoverPrepareService.updateVehicleInformation(sid);
+    }
 }

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

@@ -67,6 +67,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -425,12 +426,19 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
         List<AppBusHandoverPrepareVehicleDto> handoverPrepareVehicleDtos = dto.getCarDataList();
         if (handoverPrepareVehicleDtos.size() > 0) {
             String sid = dto.getSid();
-            busHandoverPrepareVehicleService.deleteByMainSid(sid);
+//            busHandoverPrepareVehicleService.deleteByMainSid(sid);
             for (AppBusHandoverPrepareVehicleDto handoverPrepareVehicleDto : handoverPrepareVehicleDtos) {
-                BusHandoverPrepareVehicle busHandoverPrepareVehicle = new BusHandoverPrepareVehicle();
+               /* BusHandoverPrepareVehicle busHandoverPrepareVehicle = new BusHandoverPrepareVehicle();
                 BeanUtil.copyProperties(handoverPrepareVehicleDto, busHandoverPrepareVehicle);
                 busHandoverPrepareVehicle.setMainSid(busHandoverPrepare.getSid());
-                busHandoverPrepareVehicleService.save(busHandoverPrepareVehicle);
+                busHandoverPrepareVehicleService.save(busHandoverPrepareVehicle);*/
+                BusHandoverPrepareVehicle busHandoverPrepareVehicle = busHandoverPrepareVehicleService.fetchBySid(handoverPrepareVehicleDto.getSid());
+                busHandoverPrepareVehicle.setInvoicingState(handoverPrepareVehicleDto.isInvoicingState()?1:0);
+                busHandoverPrepareVehicle.setCertificateState(handoverPrepareVehicleDto.isCertificateState()?1:0);
+                busHandoverPrepareVehicle.setOnBoardDataState(handoverPrepareVehicleDto.isOnBoardDataState()?1:0);
+                busHandoverPrepareVehicle.setOtherDataState(handoverPrepareVehicleDto.isOtherDataState()?1:0);
+                busHandoverPrepareVehicle.setPolicyState(handoverPrepareVehicleDto.isPolicyState()?1:0);
+                busHandoverPrepareVehicleService.updateById(busHandoverPrepareVehicle);
             }
         }
         updateById(busHandoverPrepare);
@@ -468,12 +476,19 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
         List<AppBusHandoverPrepareVehicleDto> handoverPrepareVehicleDtos = dto.getCarDataList();
         if (handoverPrepareVehicleDtos.size() > 0) {
             String sid = dto.getSid();
-            busHandoverPrepareVehicleService.deleteByMainSid(sid);
+//            busHandoverPrepareVehicleService.deleteByMainSid(sid);
             for (AppBusHandoverPrepareVehicleDto handoverPrepareVehicleDto : handoverPrepareVehicleDtos) {
-                BusHandoverPrepareVehicle busHandoverPrepareVehicle = new BusHandoverPrepareVehicle();
+                BusHandoverPrepareVehicle busHandoverPrepareVehicle = busHandoverPrepareVehicleService.fetchBySid(handoverPrepareVehicleDto.getSid());
+                busHandoverPrepareVehicle.setInvoicingState(handoverPrepareVehicleDto.isInvoicingState()?1:0);
+                busHandoverPrepareVehicle.setCertificateState(handoverPrepareVehicleDto.isCertificateState()?1:0);
+                busHandoverPrepareVehicle.setOnBoardDataState(handoverPrepareVehicleDto.isOnBoardDataState()?1:0);
+                busHandoverPrepareVehicle.setOtherDataState(handoverPrepareVehicleDto.isOtherDataState()?1:0);
+                busHandoverPrepareVehicle.setPolicyState(handoverPrepareVehicleDto.isPolicyState()?1:0);
+                busHandoverPrepareVehicleService.updateById(busHandoverPrepareVehicle);
+               /* BusHandoverPrepareVehicle busHandoverPrepareVehicle = new BusHandoverPrepareVehicle();
                 BeanUtil.copyProperties(handoverPrepareVehicleDto, busHandoverPrepareVehicle);
                 busHandoverPrepareVehicle.setMainSid(busHandoverPrepare.getSid());
-                busHandoverPrepareVehicleService.save(busHandoverPrepareVehicle);
+                busHandoverPrepareVehicleService.save(busHandoverPrepareVehicle);*/
 
                 BusHandoverWaitDto busHandoverWaitDto = new BusHandoverWaitDto();
                 busHandoverWaitDto.setContractNo(busHandoverPrepare.getContractNo());
@@ -486,6 +501,8 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
                     busHandoverWaitDto.setModelSid(data.getModelSid());
                     busHandoverWaitDto.setModelName(data.getModelName());
                 }
+                busHandoverWaitDto.setPayStateKey(busHandoverPrepareVehicle.getSubscriptionKey());
+                busHandoverWaitDto.setPayStateValue(busHandoverPrepareVehicle.getSubscription());
                 busHandoverWaitDto.setUseOrgSid(busHandoverPrepare.getUseOrgSid());
                 busHandoverWaitDto.setPayTypeKey(busHandoverPrepare.getPayTypeKey());
                 busHandoverWaitDto.setPayTypeValue(busHandoverPrepare.getPayType());
@@ -498,12 +515,17 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
         return rb.success();
     }
 
+    /**
+     * 交车准备获取随车资料
+     * @param sid
+     * @return
+     */
     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){
+        if (busVehicleInformationHandover != null) {
             handoverInformationVo.setContractNo(busVehicleInformationHandover.getContractNo());
             handoverInformationVo.setCustomerName(busVehicleInformationHandover.getCustomerName());
             handoverInformationVo.setVinNo(busVehicleInformationHandover.getVinNo());
@@ -515,4 +537,21 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
         }
         return rb.success().setData(handoverInformationVo);
     }
+
+    /**
+     * 随车资料确认
+     *
+     * @param sid
+     * @return
+     */
+    public ResultBean updateVehicleInformation(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        BusHandoverPrepareVehicle busHandoverPrepareVehicle = busHandoverPrepareVehicleService.fetchBySid(sid);
+        BusVehicleInformationHandover busVehicleInformationHandover = busVehicleInformationHandoverService.getVehicleInformationInfo(busHandoverPrepareVehicle.getVinSid());
+        if (busVehicleInformationHandover != null) {
+            //根据随车资料主表sid查询随车资料的记录
+            busVehicleInformationService.updateDate(busVehicleInformationHandover.getSid(), new Date());
+        }
+        return rb.success();
+    }
 }

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

@@ -6,6 +6,7 @@ import com.yxt.anrui.buscenter.api.busvehicleinformation.BusVehicleInformation;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -20,4 +21,6 @@ public interface BusVehicleInformationMapper extends BaseMapper<BusVehicleInform
     BusVehicleInformation selectByHandoverNumAndHandoverSid(@Param("handoverNum")String handoverNum, @Param("sid")String sid);
 
     List<HandoverInformationIntemVo> selectByMainSid(String sid);
+
+    int selectByMainSidUpdate(@Param("sid") String sid, @Param("date") Date date);
 }

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

@@ -21,6 +21,10 @@
     </select>
 
     <select id="selectByMainSid" resultType="com.yxt.anrui.buscenter.api.bushandoverprepare.HandoverInformationIntemVo">
-        select vehicleHandoverData,recName,transferName from bus_vehicle_information where handoverSid = #{sid}
+        select vehicleHandoverData,recName,transferName,remarks,DATE_FORMAT(recTime,'%Y-%m-%d') AS recTime from bus_vehicle_information where handoverSid = #{sid}
+    </select>
+
+    <select id="selectByMainSidUpdate" resultType="int">
+        update bus_vehicle_information set recTime = #{date} where handoverSid = #{sid}
     </select>
 </mapper>

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

@@ -5,6 +5,7 @@ import com.yxt.anrui.buscenter.api.busvehicleinformation.BusVehicleInformation;
 import com.yxt.common.base.service.MybatisBaseService;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -26,4 +27,8 @@ public class BusVehicleInformationService extends MybatisBaseService<BusVehicleI
     public List<HandoverInformationIntemVo> selectByMainSid(String sid) {
         return baseMapper.selectByMainSid(sid);
     }
+
+    public int updateDate(String sid, Date date) {
+        return baseMapper.selectByMainSidUpdate(sid, date);
+    }
 }