Merge remote-tracking branch 'origin/master'

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/AppRepaymentPlanDetailsVo.java

@@ -25,9 +25,9 @@ public class AppRepaymentPlanDetailsVo implements Vo {
     @ApiModelProperty("车辆台数")
     private String carNumber;
     @ApiModelProperty("车架号")
-    private String vinNo;
+    private List<String> vinNo;
     @ApiModelProperty("资方")
-    private String managementName;
+    private String management;
     @ApiModelProperty("金融产品")
     private String financial;
     @ApiModelProperty("销售专员")

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactService.java

@@ -116,7 +116,7 @@ public class LoanMortgageInformationTransactService extends MybatisBaseService<L
             for (String busSid : busSids) {
                 LoanMortgageInformationTransactVo vo = new LoanMortgageInformationTransactVo();
                 vo.setShowHandleBtn(true);
-                vo.setDisbursementDate("-");
+//                vo.setDisbursementDate("-");
                 vo.setSid(busSid);
                 //根据业务车辆sid查询 销售订单业务车辆表
                 BusSalesOrderVehicle orderVehicle = busSalesOrderVehicleFeign.details(busSid).getData();
@@ -563,10 +563,8 @@ public class LoanMortgageInformationTransactService extends MybatisBaseService<L
 
     public ResultBean<LoanMortgageInformationTransactDetailsVo> getMortgageInfo(String busVinSid) {
         ResultBean<LoanMortgageInformationTransactDetailsVo> rb = ResultBean.fireFail();
-        LoanMortgageInformationTransactDetailsVo vo = baseMapper.getMortgageInfo(busVinSid);
+        LoanMortgageInformationTransactDetailsVo fetchVo = baseMapper.getMortgageInfo(busVinSid);
-        if (StringUtils.isBlank(vo.getMortgageDate())) {
+        LoanMortgageInformationTransactDetailsVo vo = new LoanMortgageInformationTransactDetailsVo();
-            vo.setMortgageDate("-");
-        }
         //根据业务车辆sid查询 销售订单业务车辆表
         BusSalesOrderVehicle orderVehicle = busSalesOrderVehicleFeign.details(busVinSid).getData();
         if (null != orderVehicle) {
@@ -616,6 +614,21 @@ public class LoanMortgageInformationTransactService extends MybatisBaseService<L
                 vo.setDrivingFiles(drivingFiles);
             }
         }
+        if (null != fetchVo) {
+            if (StringUtils.isNotBlank(fetchVo.getMortgageDate())) {
+                vo.setMortgageDate(fetchVo.getMortgageDate());
+            }
+            if (StringUtils.isNotBlank(fetchVo.getRemarks())) {
+                vo.setRemarks(fetchVo.getRemarks());
+            }
+//            else {
+//                vo.setMortgageDate("-");
+//            }
+        }
+//        else {
+//            vo.setMortgageDate("-");
+//        }
+        vo.setBusVinSid(busVinSid);
         return rb.success().setData(vo);
     }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java

@@ -596,10 +596,11 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                 vo.setCarNumber(schedule.getVehCount());
             }
             if (StringUtils.isNotBlank(schedule.getVinNo())) {
-                vo.setVinNo(schedule.getVinNo());
+                List<String> stringList = Arrays.asList(schedule.getVinNo().split(","));
+                vo.setVinNo(stringList);
             }
             if (StringUtils.isNotBlank(schedule.getBankName())) {
-                vo.setManagementName(schedule.getBankName());
+                vo.setManagement(schedule.getBankName());
             }
             if (StringUtils.isNotBlank(schedule.getPolicyName())) {
                 vo.setFinancial(schedule.getPolicyName());

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanDetailsVo.java

@@ -24,9 +24,10 @@ public class RepaymentPlanDetailsVo implements Vo {
     @ApiModelProperty("车辆台数")
     private String carNumber;
     @ApiModelProperty("车架号")
-    private String vinNo;
+//    private String vinNo;
+    private List<String> vinNo = new ArrayList<>();
     @ApiModelProperty("资方")
-    private String managementName;
+    private String management;
     @ApiModelProperty("金融产品")
     private String financial;
     @ApiModelProperty("销售专员")