From 526c5b23815af250915f83df3b22737d70c62504 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 26 Jun 2023 14:30:50 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/ftl/gd2.ftl | 29 +++++++++++++++++-- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/gd2.ftl b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/gd2.ftl index 61243e232d..d14bd010c5 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/gd2.ftl +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/gd2.ftl @@ -612,7 +612,19 @@ 一、时间： + + + + + + + + + + + + @@ -646,6 +658,17 @@ 、地点： + + + + + + + + + + + @@ -906,7 +929,7 @@ - + @@ -968,7 +991,7 @@ - + @@ -989,7 +1012,7 @@ - + From 654e3b931ed4b28988ef0f58d88c07becf709c1d Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 26 Jun 2023 14:43:21 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java index 2264315839..b301904ca3 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java @@ -504,7 +504,6 @@ public class FlowableRest implements FlowableFeign { List flowElements = processService.calApprovePath(dto.getModelId(), dto.getModelId(), dto.getFormVariables()); boolean contains = false; - boolean adminSecondsContains = false; for (int i = 0; i < flowElements.size(); i++) { FlowElement flowElement = flowElements.get(i); String id = flowElement.getId(); @@ -562,9 +561,6 @@ public class FlowableRest implements FlowableFeign { if (contains) { break; } - if (adminSecondsContains) { - break; - } } if (contains) { dto.setUserSid(nextUserSid); From 983a6822abd83240733bd71d7ef34561f758ba81 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Mon, 26 Jun 2023 15:27:09 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=94=B6=E6=AC=BE?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4--=E6=94=B6=E6=AC=BE=E9=93=B6=E8=A1=8C?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=94=B9=E4=B8=BA=E6=94=B6=E6=AC=BE=E8=B4=A6?= =?UTF-8?q?=E6=88=B7=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/anruifinmanagement/agencyfund/agencyfund.vue | 2 +- .../src/views/anruifinmanagement/agencyfund/agencyfundAdd.vue | 2 +- .../src/views/anruifinmanagement/agencyfund/agencyfundInfo.vue | 2 +- .../paymentConfirmation/acknowledgementReceipt.vue | 2 +- .../paymentConfirmation/acknowledgementReceiptAdd.vue | 2 +- .../paymentConfirmation/acknowledgementReceiptInfo.vue | 2 +- .../paymentConfirmation/cashierConfirmationInfo.vue | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfund.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfund.vue index 7e39083ecc..d12e121a19 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfund.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfund.vue @@ -88,7 +88,7 @@ {{ scope.row.collectionBankNum }} - + diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfundAdd.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfundAdd.vue index ad02e693d1..13d6aca284 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfundAdd.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfundAdd.vue @@ -108,7 +108,7 @@ - 收款银行名称 + 收款账户名称 diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfundInfo.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfundInfo.vue index 1f1a68a935..f0dc5898b7 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfundInfo.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfundInfo.vue @@ -96,7 +96,7 @@ - 收款银行名称 + 收款账户名称 diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue index e0d9fab6cd..995fca9794 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue @@ -75,7 +75,7 @@ {{ scope.row.collectionBankNum }} - + diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue index 5a4d5e91f2..74ff434ff7 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue @@ -77,7 +77,7 @@ - 收款银行名称 + 收款账户名称 diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptInfo.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptInfo.vue index faa99860f5..3dfabbab90 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptInfo.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptInfo.vue @@ -97,7 +97,7 @@ - 收款银行名称 + 收款账户名称 diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmationInfo.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmationInfo.vue index a05f0ab099..e911e36d49 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmationInfo.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmationInfo.vue @@ -106,7 +106,7 @@ - 收款银行名称 + 收款账户名称 From b1bbc3210b03cfaf573ac1b16d136c7ba2e26698 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 26 Jun 2023 15:38:13 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/busdeliveredapply/BusDeliveredApplyService.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java index 5ac1bbbe90..640707f7bb 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java @@ -929,6 +929,8 @@ public class BusDeliveredApplyService extends MybatisBaseService Date: Mon, 26 Jun 2023 15:41:50 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E9=9A=8F=E8=BD=A6=E8=B5=84=E6=96=99?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=A7=BB=E5=8A=A8=E5=AF=B9=E5=A4=96=E4=BA=8C?= =?UTF-8?q?=E6=AC=A1=E4=BA=A4=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../busvehicledatahandover/AppInitDto.java | 18 ++ .../api/busvehicledatahandover/AppInitVo.java | 25 ++ .../busvehicledatahandover/AppListBean.java | 16 ++ .../busvehicledatahandover/AppUploadDto.java | 18 ++ .../BusVehicleDataHandoverFeign.java | 21 +- .../BusVehicleDataHandoverFeignFallback.java | 20 ++ .../BusVehicleInformation.java | 6 +- ...usVehicleInformationHandoverDetailsVo.java | 2 + .../BusVehicleInformationHandoverDto.java | 4 +- .../BusVehicleDataHandoverRest.java | 20 ++ .../BusVehicleDataHandoverService.java | 235 ++++++++++++++++++ .../BusVehicleInformationHandoverService.java | 65 +++-- .../VehInitDto.java | 18 ++ .../vehicleinformationhandover/VehInitVo.java | 22 ++ .../VehListBean.java | 16 ++ .../VehUploadDto.java | 18 ++ .../VehicleInformationHandoverFeign.java | 18 ++ ...hicleInformationHandoverFeignFallback.java | 20 ++ .../VehicleInformationHandoverRest.java | 20 ++ .../VehicleInformationHandoverService.java | 40 +++ 20 files changed, 599 insertions(+), 23 deletions(-) create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppInitDto.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppInitVo.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppListBean.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppUploadDto.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehInitDto.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehInitVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehListBean.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehUploadDto.java diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppInitDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppInitDto.java new file mode 100644 index 0000000000..dcba76206c --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppInitDto.java @@ -0,0 +1,18 @@ +package com.yxt.anrui.buscenter.api.busvehicledatahandover; + +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Administrator + * @description + * @date 2023/6/26 14:37 + */ +@Data +public class AppInitDto implements Dto { + private String billId; + private List vinRecordSid = new ArrayList<>(); +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppInitVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppInitVo.java new file mode 100644 index 0000000000..dfda8e222c --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppInitVo.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.buscenter.api.busvehicledatahandover; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +/** + * @author Administrator + * @description + * @date 2023/6/26 10:01 + */ +@Data +public class AppInitVo implements Vo { + private String userSid; + private String orgPath; + private String contractId; + private String customerName; + private String operaName; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date operaDate; + private List list; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppListBean.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppListBean.java new file mode 100644 index 0000000000..90e21ed312 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppListBean.java @@ -0,0 +1,16 @@ +package com.yxt.anrui.buscenter.api.busvehicledatahandover; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/6/26 10:02 + */ +@Data +public class AppListBean implements Vo { + private String carRecordSid; + private String vin; + private String info; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppUploadDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppUploadDto.java new file mode 100644 index 0000000000..0dd5e9d464 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppUploadDto.java @@ -0,0 +1,18 @@ +package com.yxt.anrui.buscenter.api.busvehicledatahandover; + +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Administrator + * @description + * @date 2023/6/26 9:01 + */ +@Data +public class AppUploadDto implements Dto { + private String billId; + private List imgs = new ArrayList<>(); +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/BusVehicleDataHandoverFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/BusVehicleDataHandoverFeign.java index c7ef6c8411..df37bbc142 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/BusVehicleDataHandoverFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/BusVehicleDataHandoverFeign.java @@ -49,7 +49,7 @@ public interface BusVehicleDataHandoverFeign { public ResultBean details(@PathVariable("sid") String sid); @ApiOperation("根据单据编号获得记录") - @GetMapping("/getOneByBillNo") + @GetMapping("/getDataByBillNo") @ResponseBody public ResultBean> getDataByBillNo(@RequestParam("billNo") String billNo); @@ -105,4 +105,23 @@ public interface BusVehicleDataHandoverFeign { @ResponseBody ResultBean> getCarDocsConfirmList(@RequestBody PagerQuery pagerQuery); + + @ApiOperation(("查看图片")) + @GetMapping("/confirmCarDocsRecord") + public ResultBean> getCarDocsRecordImg(@RequestParam("billId") String billId); + + @ApiOperation(("上传图片")) + @PutMapping("/saveCarDocsRecordImg") + public ResultBean saveCarDocsRecordImg(@RequestBody AppUploadDto dto); + + + @ApiOperation(("编辑初始化/详情")) + @PostMapping("/initCarDocsRecord") + @ResponseBody + public ResultBean initCarDocsRecord(@RequestBody AppInitDto dto); + + @ApiOperation("新增") + @PostMapping("/confirmCarDocsRecord") + public ResultBean confirmCarDocsRecord(@RequestBody AppInitVo dto); + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/BusVehicleDataHandoverFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/BusVehicleDataHandoverFeignFallback.java index 2498aaf349..70763a3f03 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/BusVehicleDataHandoverFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/BusVehicleDataHandoverFeignFallback.java @@ -91,4 +91,24 @@ public class BusVehicleDataHandoverFeignFallback implements BusVehicleDataHandov public ResultBean> getCarDocsConfirmList(PagerQuery pagerQuery) { return null; } + + @Override + public ResultBean> getCarDocsRecordImg(String billId) { + return null; + } + + @Override + public ResultBean saveCarDocsRecordImg(AppUploadDto dto) { + return null; + } + + @Override + public ResultBean initCarDocsRecord(AppInitDto dto) { + return null; + } + + @Override + public ResultBean confirmCarDocsRecord(AppInitVo dto) { + return null; + } } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformation/BusVehicleInformation.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformation/BusVehicleInformation.java index b61bf92651..905ce4b378 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformation/BusVehicleInformation.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformation/BusVehicleInformation.java @@ -5,6 +5,7 @@ import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; + import java.util.Date; /** @@ -47,5 +48,8 @@ public class BusVehicleInformation extends BaseEntity { private String vehicleHandoverData; // @ApiModelProperty("移交备注") private String transferRemarks; // 移交备注 - + @ApiModelProperty("接收人sid") + private String receiverSid; + @ApiModelProperty("移交人sid") + private String transferSid; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverDetailsVo.java index 651a57801a..180d345930 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverDetailsVo.java @@ -18,6 +18,8 @@ import java.util.Date; public class BusVehicleInformationHandoverDetailsVo implements Vo { private String sid; + private String createBySid; + private String orgSidPath; @ApiModelProperty("车辆sid") private String vehicleSid; // 车辆sid @ApiModelProperty("是否是燃气车 0不是1是") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverDto.java index 0bb7da7fa0..0fb01d1896 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverDto.java @@ -1,6 +1,5 @@ package com.yxt.anrui.buscenter.api.busvehicleinformationhandover; -import com.yxt.anrui.buscenter.api.busvehicleinformation.BusVehicleInformation; import com.yxt.anrui.buscenter.api.busvehicleinformation.BusVehicleInformationDto; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModel; @@ -20,6 +19,7 @@ import java.util.List; public class BusVehicleInformationHandoverDto implements Dto { private String sid; + private String orgSidPath; @ApiModelProperty("移交状态key002待移交 001未移交 004已移交 003移交中") private String transferStateKey; @ApiModelProperty("移交状态") @@ -58,8 +58,6 @@ public class BusVehicleInformationHandoverDto implements Dto { private Boolean complete; // ture/false 完成/未完成 @ApiModelProperty("是否修改状态") private Boolean modifyState; // ture/false 是/否 - @ApiModelProperty("使用组织全路径") - private String orgSidPath; @ApiModelProperty("接收人sid") private String receiverSid; diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverRest.java index 4dfd0da0a7..fa2a3d65ca 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverRest.java @@ -109,4 +109,24 @@ public class BusVehicleDataHandoverRest implements BusVehicleDataHandoverFeign { public ResultBean> getCarDocsConfirmList(PagerQuery pagerQuery) { return busVehicleDataHandoverService.getCarDocsConfirmList(pagerQuery); } + + @Override + public ResultBean> getCarDocsRecordImg(String billId) { + return busVehicleDataHandoverService.getCarDocsRecordImg(billId); + } + + @Override + public ResultBean saveCarDocsRecordImg(AppUploadDto dto) { + return busVehicleDataHandoverService.saveCarDocsRecordImg(dto); + } + + @Override + public ResultBean initCarDocsRecord(AppInitDto dto) { + return busVehicleDataHandoverService.initCarDocsRecord(dto); + } + + @Override + public ResultBean confirmCarDocsRecord(AppInitVo dto) { + return busVehicleDataHandoverService.confirmCarDocsRecord(dto); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverService.java index 45199291d7..06c7df6968 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverService.java @@ -698,4 +698,239 @@ public class BusVehicleDataHandoverService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return rb.success().setData(p); } + + /** + * 上传图片 + * + * @param dto + * @return + */ + public ResultBean saveCarDocsRecordImg(AppUploadDto dto) { + ResultBean rb = ResultBean.fireFail(); + String billId = dto.getBillId(); + List data = getDataByBillNo(billId).getData(); + data.removeAll(Collections.singleton(null)); + if (!data.isEmpty()) { + for (BusVehicleDataHandover handover : data) { + String saveSid = handover.getSid(); + buscenterFileService.delByLinkSidOrType(saveSid, BuscenterFileEnum.VEHICLE_SECOND_DATA_HANDOVER.getAttachType()); + List imgs = dto.getImgs(); + if (!imgs.isEmpty()) { + buscenterFileService.saveAll(saveSid, imgs, BuscenterFileEnum.VEHICLE_SECOND_DATA_HANDOVER.getAttachType()); + } + } + } + return rb.success(); + } + + /** + * 查看图片 + * + * @param billId + * @return + */ + public ResultBean> getCarDocsRecordImg(String billId) { + ResultBean> rb = ResultBean.fireFail(); + List data = getDataByBillNo(billId).getData(); + data.removeAll(Collections.singleton(null)); + if (!data.isEmpty()) { + for (BusVehicleDataHandover datum : data) { + String sid = datum.getSid(); + if (StringUtils.isNotBlank(datum.getLinkSid())) { + //交车资料确认单 + List fileList = buscenterFileService.selectByLinkSid(sid, BuscenterFileEnum.ENTRUST_CONFIRM_IMAGES.getAttachType()); + fileList.removeAll(Collections.singleton(null)); + if (!fileList.isEmpty()) { + List entrustConfirmImages = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList()); + return rb.success().setData(entrustConfirmImages); + } + } else { + //交车资料确认单 + List fileList = buscenterFileService.selectByLinkSid(sid, BuscenterFileEnum.VEHICLE_SECOND_DATA_HANDOVER.getAttachType()); + fileList.removeAll(Collections.singleton(null)); + if (!fileList.isEmpty()) { + List entrustConfirmImages = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList()); + return rb.success().setData(entrustConfirmImages); + } + } + } + } + return rb.success(); + } + + /** + * 编辑初始化/详情 + * + * @param dto + * @return + */ + public ResultBean initCarDocsRecord(AppInitDto dto) { + ResultBean rb = ResultBean.fireFail(); + AppInitVo vo = new AppInitVo(); + List list = new ArrayList<>(); + if (StringUtils.isNotBlank(dto.getBillId())) { + return rb.success().setData(vo); + } else { + List sids = dto.getVinRecordSid(); + vo.setOperaDate(new Date()); + for (String sid : sids) { + StringBuffer sb = new StringBuffer(); + BusVehicleDataHandover entity = fetchBySid(sid); + vo.setContractId(entity.getContractNo()); + vo.setCustomerName(entity.getCustomerName()); + String linkSid = entity.getLinkSid(); + List handoverItems = busHandoverItemsService.getItemsListByMainSid(linkSid).getData(); + handoverItems.removeAll(Collections.singleton(null)); + AppListBean dataListVo = new AppListBean(); + if (!handoverItems.isEmpty()) { + for (BusHandoverItems handoverItem : handoverItems) { + if (handoverItem.getVinSid().equals(entity.getVinSid())) { + String itemValue = handoverItem.getItemKey(); + if (!itemValue.contains("001")) { + sb.append("发票").append("、"); + } + if (!itemValue.contains("002")) { + sb.append("合格证").append("、"); + } + if (!itemValue.contains("003")) { + sb.append("车钥匙").append("、"); + } + if (!itemValue.contains("004")) { + sb.append("一致性证书").append("、"); + } + if (!itemValue.contains("005")) { + sb.append("申请表").append("、"); + } + if (!itemValue.contains("006")) { + sb.append("保修手册、说明书").append("、"); + } + if (!itemValue.contains("007")) { + sb.append("环保清单").append("、"); + } + if (!itemValue.contains("008")) { + sb.append("驾驶员卡").append("、"); + } + if (!itemValue.contains("009")) { + if (handoverItem.getIsFuelVehicle().equals("0")) { + sb.append("气瓶检测合格证").append("、"); + } + } + dataListVo.setVin(handoverItem.getVinNo()); + dataListVo.setCarRecordSid(sid); + if (sb.toString().length() > 0) { + sb.delete(sb.length() - 1, sb.length()); + } + } + dataListVo.setInfo(sb.toString()); + } + } + list.add(dataListVo); + vo.setList(list); + } + } + return rb.success().setData(vo); + } + + + public ResultBean confirmCarDocsRecord(AppInitVo dto) { + ResultBean rb = ResultBean.fireFail(); + List listBeans = dto.getList(); + List sids = new ArrayList<>(); + if (!listBeans.isEmpty()) { + for (AppListBean listBean : listBeans) { + sids.add(listBean.getCarRecordSid()); + } + } + String model = ""; + String contractNo = ""; + String customerName = ""; + if (!sids.isEmpty()) { + for (String sid : sids) { + BusVehicleDataHandover entity = fetchBySid(sid); + entity.setCompleteStateKey("002"); + entity.setCompleteStateValue("已完成"); + model = entity.getModel(); + contractNo = entity.getContractNo(); + customerName = entity.getCustomerName(); + baseMapper.updateById(entity); + } + } + String userOrgSid = ""; + String billNo = ""; + String userOrgName = ""; + String createName = ""; + ResultBean orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()); + if (orgSidByPath.getSuccess()) { + userOrgSid = orgSidByPath.getData(); + //交车资料确认单编号 + billNo = getApplyCode(userOrgSid); + ResultBean organizationVo = sysOrganizationFeign.fetchBySid(userOrgSid); + if (organizationVo.getSuccess()) { + SysOrganizationVo organizationVoData = organizationVo.getData(); + if (null != organizationVoData) { + userOrgName = organizationVoData.getName(); + } + } + } + ResultBean sysUserVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid()); + if (sysUserVoResultBean.getSuccess()) { + SysUserVo data = sysUserVoResultBean.getData(); + if (null != data) { + createName = data.getName(); + } + } + List newSids = new ArrayList<>(); + if (!listBeans.isEmpty()) { + for (AppListBean vinData : listBeans) { + String recordSid = vinData.getCarRecordSid(); + BusVehicleDataHandover handover = fetchBySid(recordSid); + String vinSid = handover.getVinSid(); + BusVehicleDataHandover newEntity = new BusVehicleDataHandover(); + newSids.add(newEntity.getSid()); + newEntity.setCreateBySid(dto.getUserSid()); + newEntity.setRecDate(dto.getOperaDate()); + newEntity.setRecName(dto.getOperaName()); + newEntity.setUseOrgSid(userOrgSid); + newEntity.setBillNo(billNo); + newEntity.setUseOrgName(userOrgName); + newEntity.setVinNo(vinData.getVin()); + newEntity.setVinSid(vinSid); + newEntity.setContractNo(dto.getContractId()); + newEntity.setCustomerName(dto.getCustomerName()); + newEntity.setModel(model); + newEntity.setItems(vinData.getInfo()); + newEntity.setCreateName(createName); + newEntity.setCompleteStateValue("已完成"); + newEntity.setCompleteStateKey("002"); + newEntity.setOrgSidPath(dto.getOrgPath()); + baseMapper.insert(newEntity); + } + } + BusVehicleDataHandoverPdfVo pdfVo = new BusVehicleDataHandoverPdfVo(); + List pdfVos = new ArrayList<>(); + pdfVo.setBillNo(billNo); + pdfVo.setContractNo(contractNo); + pdfVo.setCustomerName(customerName); + if (!listBeans.isEmpty()) { + int sNo = 1; + for (AppListBean dataVo : listBeans) { + BusDataListPdfVo dataPdfVo = new BusDataListPdfVo(); + dataPdfVo.setSNo(String.valueOf(sNo++)); + dataPdfVo.setVinNo(dataVo.getVin()); + dataPdfVo.setItems(dataVo.getInfo()); + pdfVos.add(dataPdfVo); + } + } + pdfVo.setPdfVos(pdfVos); + String s = commonCreatePdf(pdfVo); + String filePath = s.substring(docPdfComponent.getUploadTemplateUrl().length()); + if (!newSids.isEmpty()) { + for (String newSid : newSids) { + BusVehicleDataHandover handover = fetchBySid(newSid); + handover.setDownloadPath(filePath); + baseMapper.updateById(handover); + } + } + return rb.success(); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverService.java index 9ad1e78272..b36e2c420d 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverService.java @@ -30,6 +30,7 @@ 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 com.yxt.messagecenter.api.message.MessageFeign; import com.yxt.messagecenter.api.message.MessagePushTransferDto; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -68,6 +69,9 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService informations = busVehicleInformationService.getByHandoverSid(sid); - if (null != informations && !informations.isEmpty() && informations.size() < 2) { + //判断是否已经交接过两次 + if (informations.size() == 2) { + return rb.success().setMsg("已经完成二次交接，请勿重复交接"); + } + informations.removeAll(Collections.singleton(null)); + if (!informations.isEmpty() && informations.size() < 2) { for (BusVehicleInformation information : informations) { BusVehicleInformation twiceInformation = new BusVehicleInformation(); if ("001".equals(information.getHandoverNum())) { @@ -115,6 +129,21 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService informationList = busVehicleInformationService.getByHandoverSid(dto.getSid()); if (null != informationList && informationList.size() > 0) { diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehInitDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehInitDto.java new file mode 100644 index 0000000000..89f6edc0db --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehInitDto.java @@ -0,0 +1,18 @@ +package com.yxt.anrui.terminal.api.autoservice.vehicleinformationhandover; + +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Administrator + * @description + * @date 2023/6/26 14:37 + */ +@Data +public class VehInitDto implements Dto { + private String billId; + private List vinRecordSid = new ArrayList<>(); +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehInitVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehInitVo.java new file mode 100644 index 0000000000..321681d9a5 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehInitVo.java @@ -0,0 +1,22 @@ +package com.yxt.anrui.terminal.api.autoservice.vehicleinformationhandover; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +import java.util.List; + +/** + * @author Administrator + * @description + * @date 2023/6/26 10:01 + */ +@Data +public class VehInitVo implements Vo { + private String userSid; + private String orgPath; + private String contractId; + private String customerName; + private String operaName; + private String operaDate; + private List list; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehListBean.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehListBean.java new file mode 100644 index 0000000000..2695efc7f8 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehListBean.java @@ -0,0 +1,16 @@ +package com.yxt.anrui.terminal.api.autoservice.vehicleinformationhandover; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/6/26 10:02 + */ +@Data +public class VehListBean implements Vo { + private String carRecordSid; + private String vin; + private String info; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehUploadDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehUploadDto.java new file mode 100644 index 0000000000..1b3f4533a4 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehUploadDto.java @@ -0,0 +1,18 @@ +package com.yxt.anrui.terminal.api.autoservice.vehicleinformationhandover; + +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Administrator + * @description + * @date 2023/6/26 9:25 + */ +@Data +public class VehUploadDto implements Dto { + private String billId; + private List imgs = new ArrayList<>(); +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehicleInformationHandoverFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehicleInformationHandoverFeign.java index ee78c4823f..e049b9b416 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehicleInformationHandoverFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehicleInformationHandoverFeign.java @@ -106,4 +106,22 @@ public interface VehicleInformationHandoverFeign { @ResponseBody ResultBean> getCarDocsConfirmList(@RequestBody PagerQuery pagerQuery); + @ApiOperation(("上传图片")) + @PutMapping("/saveCarDocsRecordImg") + public ResultBean saveCarDocsRecordImg(@RequestBody VehUploadDto dto); + + @ApiOperation(("查看图片")) + @GetMapping("/confirmCarDocsRecord") + public ResultBean> getCarDocsRecordImg(@RequestParam("billId") String billId); + + + @ApiOperation(("编辑初始化/详情")) + @PostMapping("/initCarDocsRecord") + @ResponseBody + public ResultBean initCarDocsRecord(@RequestBody VehInitDto dto); + + @ApiOperation("新增") + @PostMapping("/confirmCarDocsRecord") + public ResultBean confirmCarDocsRecord(@RequestBody VehInitVo dto); + } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehicleInformationHandoverFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehicleInformationHandoverFeignFallback.java index 81467596f9..12810685ec 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehicleInformationHandoverFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehicleInformationHandoverFeignFallback.java @@ -95,4 +95,24 @@ public class VehicleInformationHandoverFeignFallback implements VehicleInformati public ResultBean> getCarDocsConfirmList(PagerQuery pagerQuery) { return null; } + + @Override + public ResultBean saveCarDocsRecordImg(VehUploadDto dto) { + return null; + } + + @Override + public ResultBean> getCarDocsRecordImg(String billId) { + return null; + } + + @Override + public ResultBean initCarDocsRecord(VehInitDto dto) { + return null; + } + + @Override + public ResultBean confirmCarDocsRecord(VehInitVo dto) { + return null; + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/vehicleinformationhandover/VehicleInformationHandoverRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/vehicleinformationhandover/VehicleInformationHandoverRest.java index 7701cc5197..8fb92645c4 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/vehicleinformationhandover/VehicleInformationHandoverRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/vehicleinformationhandover/VehicleInformationHandoverRest.java @@ -104,4 +104,24 @@ public class VehicleInformationHandoverRest implements VehicleInformationHandove public ResultBean> getCarDocsConfirmList(PagerQuery pagerQuery) { return vehicleInformationHandoverService.getCarDocsConfirmList(pagerQuery); } + + @Override + public ResultBean saveCarDocsRecordImg(VehUploadDto dto) { + return vehicleInformationHandoverService.saveCarDocsRecordImg(dto); + } + + @Override + public ResultBean> getCarDocsRecordImg(String billId) { + return vehicleInformationHandoverService.getCarDocsRecordImg(billId); + } + + @Override + public ResultBean initCarDocsRecord(VehInitDto dto) { + return vehicleInformationHandoverService.initCarDocsRecord(dto); + } + + @Override + public ResultBean confirmCarDocsRecord(VehInitVo dto) { + return vehicleInformationHandoverService.confirmCarDocsRecord(dto); + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/vehicleinformationhandover/VehicleInformationHandoverService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/vehicleinformationhandover/VehicleInformationHandoverService.java index ddffb55209..a7c6cfcca1 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/vehicleinformationhandover/VehicleInformationHandoverService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/vehicleinformationhandover/VehicleInformationHandoverService.java @@ -322,4 +322,44 @@ public class VehicleInformationHandoverService { } return rb.success().setData(pagerVo); } + + public ResultBean saveCarDocsRecordImg(VehUploadDto dto) { + ResultBean rb = ResultBean.fireFail(); + AppUploadDto appDto = new AppUploadDto(); + BeanUtil.copyProperties(dto, appDto); + busVehicleDataHandoverFeign.saveCarDocsRecordImg(appDto); + return rb.success(); + } + + public ResultBean> getCarDocsRecordImg(String billId) { + ResultBean> rb = ResultBean.fireFail(); + ResultBean> resultBean = busVehicleDataHandoverFeign.getCarDocsRecordImg(billId); + if (resultBean.getSuccess()) { + List data = resultBean.getData(); + return rb.success().setData(data); + } + return rb.success(); + } + + public ResultBean initCarDocsRecord(VehInitDto dto) { + ResultBean rb = ResultBean.fireFail(); + VehInitVo vo = new VehInitVo(); + AppInitDto appDto = new AppInitDto(); + BeanUtil.copyProperties(dto, appDto); + ResultBean resultBean = busVehicleDataHandoverFeign.initCarDocsRecord(appDto); + if (resultBean.getSuccess()) { + AppInitVo data = resultBean.getData(); + BeanUtil.copyProperties(data, vo); + return rb.success().setData(vo); + } + return rb.success(); + } + + public ResultBean confirmCarDocsRecord(VehInitVo dto) { + ResultBean rb = ResultBean.fireFail(); + AppInitVo appDto = new AppInitVo(); + BeanUtil.copyProperties(dto, appDto); + ResultBean resultBean = busVehicleDataHandoverFeign.confirmCarDocsRecord(appDto); + return rb.success(); + } }