移动端对接测试车辆交回报备模块并补充优化部分字段参数

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApply.java

@@ -60,6 +60,8 @@ public class LoanRestoreReportApply extends BaseEntity {
     private String deptSid; // 申请部门sid
 	@ApiModelProperty("申请部门名称")
     private String deptName; // 申请部门名称
+    @ApiModelProperty("销售订单车辆sid")
+    private String saleVehSid;
 	@ApiModelProperty("车架号")
     private String vinNo; // 车架号
 	@ApiModelProperty("车牌号")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApplyDetailsVo.java

@@ -68,6 +68,8 @@ public class LoanRestoreReportApplyDetailsVo implements Vo {
     private String deptSid; // 申请部门sid
 	@ApiModelProperty("申请部门名称")
     private String deptName; // 申请部门名称
+    @ApiModelProperty("销售订单车辆sid")
+    private String saleVehSid;
 	@ApiModelProperty("车架号")
     private String vinNo; // 车架号
 	@ApiModelProperty("车牌号")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApplyDto.java

@@ -66,6 +66,8 @@ public class LoanRestoreReportApplyDto implements Dto {
     private String deptSid; // 申请部门sid
 	@ApiModelProperty("申请部门名称")
     private String deptName; // 申请部门名称
+    @ApiModelProperty("销售订单车辆sid")
+    private String saleVehSid;
 	@ApiModelProperty("车架号")
     private String vinNo; // 车架号
 	@ApiModelProperty("车牌号")

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyService.java

@@ -64,6 +64,7 @@ import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
 import com.yxt.anrui.riskcenter.api.loanrestorereportapply.*;
 import com.yxt.anrui.riskcenter.api.loanrestorereportapply.flowable.*;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
+import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehInit;
 import com.yxt.anrui.riskcenter.biz.loanbeoverdueveh.LoanBeOverdueVehService;
 import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
@@ -316,6 +317,10 @@ public class LoanRestoreReportApplyService extends MybatisBaseService<LoanRestor
             }
         }
         vo.setFiles(loanRestoreReportFileVos);
+        vo.setCsjlSid(entity.getSaleVehSid());
+        BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(entity.getSaleVehSid()).getData();
+        LoanSolutions loanSolutions = loanSolutionsService.selectBySaleOrderSid(busSalesOrderVehicle.getSalesOrderSid());
+        vo.setJrfaSid(loanSolutions.getSid());
         return vo;
     }
 
@@ -347,6 +352,7 @@ public class LoanRestoreReportApplyService extends MybatisBaseService<LoanRestor
         loanRestoreReportApplyDetailsVo.setJrfaSid(loanSolutions.getSid());
         loanRestoreReportApplyDetailsVo.setCurrentBeMoney(loanVehClearanceVehInit.getBeOverdueMoney());
         loanRestoreReportApplyDetailsVo.setBeOverdueMoneyAndPeriod(loanVehClearanceVehInit.getBeOverdueMoneyAndPeriod());
+        loanRestoreReportApplyDetailsVo.setSaleVehSid(saleVehSid);
         return loanRestoreReportApplyDetailsVo;
     }
 

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/restorereport/AppRestoreReportApplyDetailsVo.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.terminal.api.risk.restorereport;
 
 
+import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.AppLoanHomeVisitVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -91,14 +92,14 @@ public class AppRestoreReportApplyDetailsVo implements Vo {
     private String involveCorrMoney; // 涉及相关费用
 	@ApiModelProperty("费用说明")
     private String costRemarks; // 费用说明
-	@ApiModelProperty("流程定义的id")
-    private String procDefId; // 流程定义的id
-	@ApiModelProperty("流程实例的sid")
-    private String procInstSid; // 流程实例的sid
+    @ApiModelProperty("任务id")
+    private String taskId;
+    @ApiModelProperty("流程实例的sid")
+    private String procInsId;
     @ApiModelProperty("催收记录sid")
     private String csjlSid;
     @ApiModelProperty("金融方案")
-    private String jrfa;
+    private AppLoanHomeVisitVo jrfa;
     @ApiModelProperty("备注")
     private String remarks;
     @ApiModelProperty("附件路径")

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/restorereport/RestoreReportService.java

@@ -216,6 +216,13 @@ public class RestoreReportService {
             }
         }
         appRestoreReportApplyDetailsVo.setFiles(appFiles);
+        LoanSolutions loanSolutions = loanSolutionsFeign.fetchBySid(loanRestoreReportApplyDetailsVo.getJrfaSid()).getData();
+        CarModelVo finPage1 = commonService.getLoanSolution(loanSolutions.getSalesOrderSid()).getData();
+        AppLoanHomeVisitVo finPage2 = new AppLoanHomeVisitVo();
+        BeanUtil.copyProperties(finPage1, finPage2);
+        appRestoreReportApplyDetailsVo.setJrfa(finPage2);
+        appRestoreReportApplyDetailsVo.setTaskId(loanRestoreReportApplyDetailsVo.getTaskId());
+        appRestoreReportApplyDetailsVo.setProcInsId(loanRestoreReportApplyDetailsVo.getProcInstSid());
         return rb.success().setData(appRestoreReportApplyDetailsVo);
     }
 }