From 5d8bc3ae59529671eaec40eee8adb99ad22119a0 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 6 Nov 2023 11:39:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E7=A5=A8=E8=BD=A6=E8=BE=86=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=98=BE=E7=A4=BA=E8=B5=84=E6=96=B9=E4=BF=A1=E5=AE=A1?= =?UTF-8?q?=E7=BB=88=E5=AE=A1=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxt/anrui/fin/api/finbillapplication/VinListVos.java | 4 ++++ .../yxt/anrui/fin/api/finbillvehicle/FinBillVehicle.java | 2 ++ .../anrui/fin/api/finbillvehicle/FinBillVehicleDto.java | 4 ++++ .../biz/finbillapplication/FinBillApplicationMapper.xml | 5 ++++- .../biz/finbillapplication/FinBillApplicationService.java | 2 -- .../api/autoservice/invoiced/BillApplicationIInfoVo.java | 2 ++ .../terminal/api/autoservice/invoiced/SelBillZcVo.java | 2 ++ .../terminal/api/autoservice/invoiced/VinListDto.java | 1 + .../anrui/terminal/api/autoservice/invoiced/VinListVo.java | 1 + .../terminal/biz/autoservice/invoiced/InvoicedService.java | 7 ++++++- 10 files changed, 26 insertions(+), 4 deletions(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/VinListVos.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/VinListVos.java index eef464abc1..2225d3692b 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/VinListVos.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/VinListVos.java @@ -1,5 +1,6 @@ package com.yxt.anrui.fin.api.finbillapplication; +import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -32,6 +33,9 @@ public class VinListVos { private String certificateStateKey; // 合格证状态key @ApiModelProperty("合格证状态value") private String certificateState; // 合格证状态value + @ApiModelProperty("信审终审状态") + @JsonProperty("xSState") + private String xSState; @ApiModelProperty("主车合格证照片") private List zcHgzImages = new ArrayList<>(); } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicle.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicle.java index c02572caec..3216d5e5d8 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicle.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicle.java @@ -26,6 +26,7 @@ package com.yxt.anrui.fin.api.finbillvehicle; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -80,5 +81,6 @@ public class FinBillVehicle extends BaseEntity { @ApiModelProperty("开票信息") private String openTickRemarks; // 开票信息 @ApiModelProperty("信审终审状态") + @JsonProperty("xSState") private String xSState; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleDto.java index 9e80626ba9..adfefe26fd 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleDto.java @@ -87,6 +87,10 @@ public class FinBillVehicleDto implements Dto { @ApiModelProperty("开票信息") private String openTickRemarks; // 开票信息 + @ApiModelProperty("信审终审状态") + @JsonProperty("xSState") + private String xSState; + @ApiModelProperty("主车合格证照片") private List zcHgzImages = new ArrayList<>(); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml index 805696867f..7b736647d0 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml @@ -178,7 +178,8 @@ bv.`linkNo` AS vin, bv.`linkSid` AS vinSid, bc.`certificateState` AS certificateStateKey, - bc.`certificateStateValue` AS certificateState + bc.`certificateStateValue` AS certificateState, + lr.`capCarefulResult` AS xSState FROM anrui_buscenter.`bus_sales_order_vehicle` bv JOIN anrui_buscenter.`bus_sales_order` bo @@ -189,6 +190,8 @@ ON bv.`linkSid` = bc.`vehicleSid` JOIN anrui_buscenter.`bus_sales_order_model` bm ON bv.`salesOrderSid` = bm.`salesOrderSid` + LEFT JOIN anrui_riskcenter.`loan_capital_credit_result` lr + ON bv.`loanContractSid` = lr.`loanContractSid` where bo.contractNo = #{contractNo} and bv.linkSid = #{vinSid} \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java index eaa4d2bb94..5ae9da9609 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java @@ -4655,8 +4655,6 @@ public class FinBillApplicationService extends MybatisBaseService rb = ResultBean.fireFail(); BillApplicationIInfoVoss billApplicationIInfoVoss = new BillApplicationIInfoVoss(); BusSalesOrder busSalesOrder = baseMapper.selectNo(contractId); - ResultBean resultBean = busSalesOrderFeign.fetchDetailsBySid(busSalesOrder.getSid()); - BusSalesOrderDetailsVo busSalesOrderDetailsVo = resultBean.getData(); billApplicationIInfoVoss = baseMapper.selectByContractNos(contractId); if("1".equals(busSalesOrder.getPayTypeKey())){ billApplicationIInfoVoss.setIsCanEdit(true); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java index 9cf1e7dcf9..bf7d9570d7 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java @@ -91,4 +91,6 @@ public class BillApplicationIInfoVo implements Vo { private Boolean showValueCustomer; @ApiModelProperty("是否为单独新增") private Boolean showBtn; + @ApiModelProperty("是否显示信审终审") + private Boolean showXsState = false; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/SelBillZcVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/SelBillZcVo.java index 157c394761..2b39a936b6 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/SelBillZcVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/SelBillZcVo.java @@ -1,5 +1,6 @@ package com.yxt.anrui.terminal.api.autoservice.invoiced; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -18,6 +19,7 @@ public class SelBillZcVo implements Vo { @ApiModelProperty("合格证状态value") private String certificateState; @ApiModelProperty("信审终审状态") + @JsonProperty("xSState") private String xSState; @ApiModelProperty("主车合格证图片") private List zcHgzImages; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListDto.java index 6fa674768c..4de220efe6 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListDto.java @@ -28,5 +28,6 @@ public class VinListDto implements Dto { @ApiModelProperty("合格证状态value") private String certificateState; // 合格证状态value @ApiModelProperty("信审终审状态") + @JsonProperty("xSState") private String xSState; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListVo.java index e2fcf1af9f..b594857b10 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListVo.java @@ -32,6 +32,7 @@ public class VinListVo implements Vo { @ApiModelProperty("合格证状态value") private String certificateState; // 合格证状态value @ApiModelProperty("信审终审状态") + @JsonProperty("xSState") private String xSState; @ApiModelProperty("主车合格证照片") private List zcHgzImages = new ArrayList<>(); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java index 0382d1f7c9..b361502088 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java @@ -204,6 +204,7 @@ public class InvoicedService { vo.setInvoiceStateKey("001"); vo.setInvoiceState("正常开票"); vo.setDate(DateUtil.formatDate(new Date())); + vo.setShowXsState(true); return rb.success().setData(vo); } ResultBean resultBean = finBillApplicationFeign.fetchDetailsBySid(query.getSid()); @@ -252,7 +253,10 @@ public class InvoicedService { vinListVo.setInvoiceName(finBillVehicle.getOpenTickName()); vinListVo.setInvoiceInfo(finBillVehicle.getOpenTickRemarks()); vinListVo.setZcHgzImages(finBillVehicle.getCertificatePhoto()); - vinListVo.setXSState(finBillVehicle.getXSState()); + if (StringUtils.isNotBlank(finBillVehicle.getXSState())){ + vinListVo.setXSState(finBillVehicle.getXSState()); + vo.setShowXsState(true); + } vinListVos.add(vinListVo); } vo.setVinList(vinListVos); @@ -541,6 +545,7 @@ public class InvoicedService { finBillVehicleDto.setOpenTickSid(vinListDto.getOpenTickSid()); finBillVehicleDto.setOpenTickName(vinListDto.getInvoiceName()); finBillVehicleDto.setOpenTickRemarks(vinListDto.getInvoiceInfo()); + finBillVehicleDto.setXSState(vinListDto.getXSState()); finBillVehicleDtos.add(finBillVehicleDto); } finBillApplicationDto.setFinBillVehicles(finBillVehicleDtos);