Merge remote-tracking branch 'origin/master'

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/reportset/ReportSetService.java

@@ -31,28 +31,36 @@ public class ReportSetService extends MybatisBaseService<ReportSetMapper, Report
                 ReportSetVo reportSetVo = reportSetVosList.get(i);
                 switch (reportSetVo.getDictKey()) {
                     case "stock":
-                        reportSet.setStock(reportSetVo.isSelected() ? 1 : 0);
+//                        reportSet.setStock(reportSetVo.isSelected() ? 1 : 0);
+                        reportSet.setStock(1);
                         break;
                     case "pcOrder":
-                        reportSet.setPcOrder(reportSetVo.isSelected() ? 1 : 0);
+//                        reportSet.setPcOrder(reportSetVo.isSelected() ? 1 : 0);
+                        reportSet.setPcOrder(1);
                         break;
                     case "reserveCar":
-                        reportSet.setReserveCar(reportSetVo.isSelected() ? 1 : 0);
+//                        reportSet.setReserveCar(reportSetVo.isSelected() ? 1 : 0);
+                        reportSet.setReserveCar(1);
                         break;
                     case "sales":
-                        reportSet.setSales(reportSetVo.isSelected() ? 1 : 0);
+//                        reportSet.setSales(reportSetVo.isSelected() ? 1 : 0);
+                        reportSet.setSales(1);
                         break;
                     case "deliver":
-                        reportSet.setDeliver(reportSetVo.isSelected() ? 1 : 0);
+//                        reportSet.setDeliver(reportSetVo.isSelected() ? 1 : 0);
+                        reportSet.setDeliver(1);
                         break;
                     case "buyout":
-                        reportSet.setBuyout(reportSetVo.isSelected() ? 1 : 0);
+//                        reportSet.setBuyout(reportSetVo.isSelected() ? 1 : 0);
+                        reportSet.setBuyout(1);
                         break;
                     case "outbound":
-                        reportSet.setOutbound(reportSetVo.isSelected() ? 1 : 0);
+//                        reportSet.setOutbound(reportSetVo.isSelected() ? 1 : 0);
+                        reportSet.setOutbound(1);
                         break;
                     case "loanDis":
-                        reportSet.setLoanDis(reportSetVo.isSelected() ? 1 : 0);
+//                        reportSet.setLoanDis(reportSetVo.isSelected() ? 1 : 0);
+                        reportSet.setLoanDis(1);
                         break;
                     default:
                         break;

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordVehInit.java

@@ -31,6 +31,8 @@ public class LoanBeCollectionRecordVehInit {
     private String loanName;
     @ApiModelProperty("贷款合同编号")
     private String loanContractNo;
+    @ApiModelProperty("资方合同编号")
+    private String bankContractNo;
     @ApiModelProperty("资方")
     private String bankName;
     @ApiModelProperty("首次逾期日期")
@@ -46,6 +48,8 @@ public class LoanBeCollectionRecordVehInit {
     private String salesOrderSid;
     @ApiModelProperty("销售订单车辆sid")
     private String saleVehSid;
+    @ApiModelProperty("远程控制状态")
+    private String lockCarState;
 
     @ApiModelProperty
     private List<LoanBeCollectionVehFile> sids;

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java

@@ -456,14 +456,16 @@ public class LoanBeCollectionApplyService extends MybatisBaseService<LoanBeColle
         for (LoanBeCollectionRecordVehInit loanBeCollectionRecordVehInit : loanBeCollectionRecordVehInits) {
             LoanBeCollectionVehDetailsVo loanBeCollectionVehDetailsVo = new LoanBeCollectionVehDetailsVo();
             BeanUtil.copyProperties(loanBeCollectionRecordVehInit, loanBeCollectionVehDetailsVo);
+            loanBeCollectionVehDetailsVo.setBorrowerName(loanBeCollectionRecordVehInit.getLoanName());
             //远程控制费用获取
             int i = loanBeCollectionVehService.selBjBySaleVehSid(loanBeCollectionRecordVehInit.getSaleVehSid());
             String parameterValue = sysParameterFeign.fetchByParNo("FK_YCKZSFGZ").getData();
             String[] parameterValues = parameterValue.split(",");
-            if (i < 3){
+            String cs = parameterValues[3];
+            if (i < Integer.parseInt(cs)){
                 loanBeCollectionVehDetailsVo.setLockCarMoney(parameterValues[i]);
             }else {
-                loanBeCollectionVehDetailsVo.setLockCarMoney(parameterValues[2]);
+                loanBeCollectionVehDetailsVo.setLockCarMoney(parameterValues[i]);
                 yckzVinNo = yckzVinNo + loanBeCollectionVehDetailsVo.getVinNo() + ',';
             }
             List<LoanBeCollectionVehFile> loanBeCollectionVehFiles = new ArrayList<>();

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml

@@ -143,6 +143,7 @@
                 a1.customer AS custName,
                 a1.mobile AS custPhone,
                 a1.`loanContractNo`,
+                a1.bankContractNo,
                 a1.`bankName`,
                 a1.borrowerName AS loanName,
                 a1.vehMark AS carNum,
@@ -200,6 +201,7 @@
                 lrpd.sid,
                 lrpd.busVinSid,
                 lrpd.`loanContractNo`,
+                lrpd.`bankContractNo`,
                 lrpd.`vinNo`,
                 lrpd.`bankName`,
                 lrpd.borrowerName,