From 79b8e801ff0c8e9bbeabf60596370c1fe6e244cb Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 26 Oct 2023 18:13:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=B7=E6=AC=BE=E5=BC=80=E7=A5=A8=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E9=80=89=E6=8B=A9=E8=BD=A6=E8=BE=86=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=BF=A1=E5=AE=A1=E7=BB=88=E5=AE=A1=E7=BB=93=E6=9E=9C=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fin/api/finbillapplication/PcSelBillVinNoPageVo.java | 2 ++ .../com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicle.java | 3 ++- .../yxt/anrui/fin/api/finbillvehicle/FinBillVehicleVo.java | 4 +++- .../fin/biz/finbillapplication/FinBillApplicationMapper.xml | 5 ++++- .../api/autoservice/invoiced/SelBillVinNoPageVo.java | 2 ++ .../anrui/terminal/api/autoservice/invoiced/SelBillZcVo.java | 2 ++ .../anrui/terminal/api/autoservice/invoiced/VinListDto.java | 2 ++ .../anrui/terminal/api/autoservice/invoiced/VinListVo.java | 2 ++ .../terminal/biz/autoservice/invoiced/InvoicedService.java | 1 + 9 files changed, 20 insertions(+), 3 deletions(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/PcSelBillVinNoPageVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/PcSelBillVinNoPageVo.java index dc5de475f7..6e4d4bce76 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/PcSelBillVinNoPageVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/PcSelBillVinNoPageVo.java @@ -65,4 +65,6 @@ public class PcSelBillVinNoPageVo implements Vo { @ApiModelProperty("采购系统sid") private String purchaseSystemSid; + @ApiModelProperty("信审终审状态") + private String xSState; } 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 0a2c50b8d5..c02572caec 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 @@ -79,5 +79,6 @@ public class FinBillVehicle extends BaseEntity { private String certificateStateValue; // 合格证状态value @ApiModelProperty("开票信息") private String openTickRemarks; // 开票信息 - + @ApiModelProperty("信审终审状态") + private String xSState; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleVo.java index 8e0075599d..d1e7ec0fad 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleVo.java @@ -85,7 +85,9 @@ public class FinBillVehicleVo implements Vo { private String certificateStateValue; // 合格证状态value @ApiModelProperty("开票信息") private String openTickRemarks; // 开票信息 - + @ApiModelProperty("信审终审状态") + private String xSState; + @ApiModelProperty("合格证图片") private List certificatePhoto; // 合格证图片 } 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 6ba7342f24..805696867f 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 @@ -113,7 +113,8 @@ bo.`purchaseSystemSid`, bm.`modelName`, bm.`modelSid`, - bo.`oneBillMoney` AS kpMoney + bo.`oneBillMoney` AS kpMoney, + lr.`capCarefulResult` AS xSState FROM anrui_buscenter.`bus_sales_order_vehicle` bv JOIN anrui_buscenter.`bus_sales_order` bo @@ -124,6 +125,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` ${ew.sqlSegment} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/SelBillVinNoPageVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/SelBillVinNoPageVo.java index d9c773eece..73c31e4482 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/SelBillVinNoPageVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/SelBillVinNoPageVo.java @@ -30,6 +30,8 @@ public class SelBillVinNoPageVo implements Vo { private String modelSid; @ApiModelProperty("车型名称") private String modelName; + @ApiModelProperty("是否显示信审终审") + private Boolean showXsState = true; @ApiModelProperty("主车信息") private List cars; 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 51c131ca06..157c394761 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 @@ -17,6 +17,8 @@ public class SelBillZcVo implements Vo { private String certificateStateKey; @ApiModelProperty("合格证状态value") private String certificateState; + @ApiModelProperty("信审终审状态") + 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 a1bb876f7c..6fa674768c 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 @@ -27,4 +27,6 @@ public class VinListDto implements Dto { private String certificateStateKey; // 合格证状态key @ApiModelProperty("合格证状态value") private String certificateState; // 合格证状态value + @ApiModelProperty("信审终审状态") + 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 2b63a70d1f..e2fcf1af9f 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 @@ -31,6 +31,8 @@ public class VinListVo implements Vo { private String certificateStateKey; // 合格证状态key @ApiModelProperty("合格证状态value") private String certificateState; // 合格证状态value + @ApiModelProperty("信审终审状态") + 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 f297cf3dd0..0382d1f7c9 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 @@ -252,6 +252,7 @@ public class InvoicedService { vinListVo.setInvoiceName(finBillVehicle.getOpenTickName()); vinListVo.setInvoiceInfo(finBillVehicle.getOpenTickRemarks()); vinListVo.setZcHgzImages(finBillVehicle.getCertificatePhoto()); + vinListVo.setXSState(finBillVehicle.getXSState()); vinListVos.add(vinListVo); } vo.setVinList(vinListVos);