Browse Source

贷款开票申请选择车辆增加信审终审结果字段。

master
God 2 years ago
parent
commit
79b8e801ff
  1. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/PcSelBillVinNoPageVo.java
  2. 3
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicle.java
  3. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleVo.java
  4. 5
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml
  5. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/SelBillVinNoPageVo.java
  6. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/SelBillZcVo.java
  7. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListDto.java
  8. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListVo.java
  9. 1
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java

2
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") @ApiModelProperty("采购系统sid")
private String purchaseSystemSid; private String purchaseSystemSid;
@ApiModelProperty("信审终审状态")
private String xSState;
} }

3
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 private String certificateStateValue; // 合格证状态value
@ApiModelProperty("开票信息") @ApiModelProperty("开票信息")
private String openTickRemarks; // 开票信息 private String openTickRemarks; // 开票信息
@ApiModelProperty("信审终审状态")
private String xSState;
} }

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleVo.java

@ -85,6 +85,8 @@ public class FinBillVehicleVo implements Vo {
private String certificateStateValue; // 合格证状态value private String certificateStateValue; // 合格证状态value
@ApiModelProperty("开票信息") @ApiModelProperty("开票信息")
private String openTickRemarks; // 开票信息 private String openTickRemarks; // 开票信息
@ApiModelProperty("信审终审状态")
private String xSState;
@ApiModelProperty("合格证图片") @ApiModelProperty("合格证图片")
private List<String> certificatePhoto; // 合格证图片 private List<String> certificatePhoto; // 合格证图片

5
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml

@ -113,7 +113,8 @@
bo.`purchaseSystemSid`, bo.`purchaseSystemSid`,
bm.`modelName`, bm.`modelName`,
bm.`modelSid`, bm.`modelSid`,
bo.`oneBillMoney` AS kpMoney bo.`oneBillMoney` AS kpMoney,
lr.`capCarefulResult` AS xSState
FROM FROM
anrui_buscenter.`bus_sales_order_vehicle` bv anrui_buscenter.`bus_sales_order_vehicle` bv
JOIN anrui_buscenter.`bus_sales_order` bo JOIN anrui_buscenter.`bus_sales_order` bo
@ -124,6 +125,8 @@
ON bv.`linkSid` = bc.`vehicleSid` ON bv.`linkSid` = bc.`vehicleSid`
JOIN anrui_buscenter.`bus_sales_order_model` bm JOIN anrui_buscenter.`bus_sales_order_model` bm
ON bv.`salesOrderSid` = bm.`salesOrderSid` ON bv.`salesOrderSid` = bm.`salesOrderSid`
LEFT JOIN anrui_riskcenter.`loan_capital_credit_result` lr
ON bv.`loanContractSid` = lr.`loanContractSid`
<where> <where>
${ew.sqlSegment} ${ew.sqlSegment}
</where> </where>

2
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; private String modelSid;
@ApiModelProperty("车型名称") @ApiModelProperty("车型名称")
private String modelName; private String modelName;
@ApiModelProperty("是否显示信审终审")
private Boolean showXsState = true;
@ApiModelProperty("主车信息") @ApiModelProperty("主车信息")
private List<SelBillZcVo> cars; private List<SelBillZcVo> cars;

2
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; private String certificateStateKey;
@ApiModelProperty("合格证状态value") @ApiModelProperty("合格证状态value")
private String certificateState; private String certificateState;
@ApiModelProperty("信审终审状态")
private String xSState;
@ApiModelProperty("主车合格证图片") @ApiModelProperty("主车合格证图片")
private List<String> zcHgzImages; private List<String> zcHgzImages;

2
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 private String certificateStateKey; // 合格证状态key
@ApiModelProperty("合格证状态value") @ApiModelProperty("合格证状态value")
private String certificateState; // 合格证状态value private String certificateState; // 合格证状态value
@ApiModelProperty("信审终审状态")
private String xSState;
} }

2
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 private String certificateStateKey; // 合格证状态key
@ApiModelProperty("合格证状态value") @ApiModelProperty("合格证状态value")
private String certificateState; // 合格证状态value private String certificateState; // 合格证状态value
@ApiModelProperty("信审终审状态")
private String xSState;
@ApiModelProperty("主车合格证照片") @ApiModelProperty("主车合格证照片")
private List<String> zcHgzImages = new ArrayList<>(); private List<String> zcHgzImages = new ArrayList<>();
} }

1
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.setInvoiceName(finBillVehicle.getOpenTickName());
vinListVo.setInvoiceInfo(finBillVehicle.getOpenTickRemarks()); vinListVo.setInvoiceInfo(finBillVehicle.getOpenTickRemarks());
vinListVo.setZcHgzImages(finBillVehicle.getCertificatePhoto()); vinListVo.setZcHgzImages(finBillVehicle.getCertificatePhoto());
vinListVo.setXSState(finBillVehicle.getXSState());
vinListVos.add(vinListVo); vinListVos.add(vinListVo);
} }
vo.setVinList(vinListVos); vo.setVinList(vinListVos);

Loading…
Cancel
Save