diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareAddDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareAddDto.java index 798d0967b7..06e92332cf 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareAddDto.java +++ b/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; + + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareFeign.java index e752802157..a3a196a836 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareFeign.java +++ b/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 getVehicleInformationInfo(@RequestParam("sid") String sid); + @ApiOperation("随车资料确认") + @PostMapping("/updateVehicleInformation") + @ResponseBody + ResultBean updateVehicleInformation(@RequestParam("sid") String sid); + } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareFeignFallback.java index 2e49847662..af15d2f547 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareFeignFallback.java +++ b/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 getVehicleInformationInfo(String sid) { return null; } + + @Override + public ResultBean updateVehicleInformation(String sid) { + return null; + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/HandoverInformationIntemVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/HandoverInformationIntemVo.java index 8af28029cf..edbf6867c5 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/HandoverInformationIntemVo.java +++ b/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; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/AppBusHandoverPrepareVehicleDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/AppBusHandoverPrepareVehicleDto.java index b6ba7b557a..09b142390d 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/AppBusHandoverPrepareVehicleDto.java +++ b/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; + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/BusHandoverPrepareVehicle.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/BusHandoverPrepareVehicle.java index 84f299a462..b3268dbc7b 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/BusHandoverPrepareVehicle.java +++ b/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; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java index 596fdbc1d6..df3ab7bd59 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java +++ b/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 filesList = new ArrayList<>(); if (StringUtils.isNotBlank(carContractDownloadUrl)) { @@ -891,13 +891,13 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService { int updateStateByContractNo(@Param("contractNo") String contractNo, @Param("list") List vinSidList, @Param("state") int i); IPage selectListsVo(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); + + BusDelivered getState(@Param("contractNo") String contractNo, @Param("vinSid") String vinSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml index 498da9fbbf..9296f12d82 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml +++ b/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 + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java index 61218ce387..043e687d54 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java +++ b/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 getVehicleInformationInfo(String sid) { return busHandoverPrepareService.getVehicleInformationInfo(sid); } + + @Override + public ResultBean updateVehicleInformation(String sid) { + return busHandoverPrepareService.updateVehicleInformation(sid); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java index 6d5594bff0..1b7574b7dc 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java +++ b/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 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 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 getVehicleInformationInfo(String sid) { ResultBean 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 selectByMainSid(String sid); + + int selectByMainSidUpdate(@Param("sid") String sid, @Param("date") Date date); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationMapper.xml index 146389ffa5..28a800bc5f 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationMapper.xml @@ -21,6 +21,10 @@ + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationService.java index ba008b8246..2f5b876612 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationService.java +++ b/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 selectByMainSid(String sid) { return baseMapper.selectByMainSid(sid); } + + public int updateDate(String sid, Date date) { + return baseMapper.selectByMainSidUpdate(sid, date); + } }