Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml

@@ -304,5 +304,6 @@
         where customerSid = #{sid}
           and nodeState = '已办结'
           and effectiveDate > NOW()
+        order by id desc limit 1
     </select>
 </mapper>

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportFeign.java

@@ -89,7 +89,7 @@ public interface DailyReportFeign {
     @ApiOperation("集团日期初始化")
     @GetMapping("getReport")
     @ResponseBody
-    ResultBean<ReportVo> getReport(@RequestParam("date") String date);
+    ResultBean<ReportVo> getReport(@RequestParam("date") String date,@RequestParam("userSid") String userSid);
 
     @ApiOperation("集团事业部合集日报表")
     @GetMapping("list2")
@@ -114,7 +114,7 @@ public interface DailyReportFeign {
     @ApiOperation("事业部日期初始化")
     @GetMapping("getReport2")
     @ResponseBody
-    ResultBean<ReportVo> getReport2(@RequestParam("date") String date, @RequestParam("orgPath") String orgPath);
+    ResultBean<ReportVo> getReport2(@RequestParam("date") String date, @RequestParam("orgPath") String orgPath,@RequestParam("userSid")String userSid);
 
     @ApiOperation("分公司日报表分页列表")
     @PostMapping("pageList3")
@@ -124,5 +124,7 @@ public interface DailyReportFeign {
     @ApiOperation("分公司日期初始化")
     @GetMapping("getReport3")
     @ResponseBody
-    ResultBean<ReportVo> getReport3(@RequestParam("date") String date, @RequestParam("orgPath") String orgPath);
+    ResultBean<ReportVo> getReport3(@RequestParam("date") String date, @RequestParam("orgPath") String orgPath,@RequestParam("userSid")String userSid);
+
+
 }

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/ReportVo.java

@@ -1,9 +1,12 @@
 package com.yxt.anrui.reportcenter.api.dailyreport;
 
+import com.yxt.anrui.reportcenter.api.reportset.ReportSetVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @description:
  * @author: dimengzhe
@@ -113,4 +116,6 @@ public class ReportVo implements Vo {
     private String busOrgSid;
 
     private String useOrgSid;
+
+    private List<ReportSetVo> list;
 }

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/reportset/ReportSet.java

@@ -0,0 +1,33 @@
+package com.yxt.anrui.reportcenter.api.reportset;
+
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/15
+ **/
+@Data
+public class ReportSet extends BaseEntity {
+    private static final long serialVersionUID = 5482028936042457717L;
+    @ApiModelProperty("库存")
+    private int stock;
+    @ApiModelProperty("排产")
+    private int pcOrder;
+    @ApiModelProperty("订车")
+    private int reserveCar;
+    @ApiModelProperty("销售")
+    private int sales;
+    @ApiModelProperty("交付")
+    private int deliver;
+    @ApiModelProperty("买断")
+    private int buyout;
+    @ApiModelProperty("欠款出库")
+    private int outbound;
+    @ApiModelProperty("金融未放款")
+    private int loanDis;
+
+
+}

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/reportset/ReportSetFeign.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.reportcenter.api.reportset;
+
+import com.yxt.anrui.reportcenter.api.dailyreport.DailyReportFeignFallback;
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/15
+ **/
+@FeignClient(
+        contextId = "anrui-reportcenter-ReportSet",
+        name = "anrui-reportcenter",
+        path = "v1/ReportSet",
+        fallback = ReportSetFeignFallback.class)
+public interface ReportSetFeign {
+
+    @PostMapping("save")
+    @ResponseBody
+    ResultBean save(@RequestBody ReportSetQuery reportSetQuery);
+}

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/reportset/ReportSetFeignFallback.java

@@ -0,0 +1,12 @@
+package com.yxt.anrui.reportcenter.api.reportset;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/15
+ **/
+@Component
+public class ReportSetFeignFallback {
+}

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/reportset/ReportSetQuery.java

@@ -0,0 +1,19 @@
+package com.yxt.anrui.reportcenter.api.reportset;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/15
+ **/
+@Data
+public class ReportSetQuery {
+
+    private String userSid;
+
+    private List<ReportSetVo> list = new ArrayList<>();
+}

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/reportset/ReportSetVo.java

@@ -0,0 +1,19 @@
+package com.yxt.anrui.reportcenter.api.reportset;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/15
+ **/
+@Data
+public class ReportSetVo {
+
+    private String dictKey;
+
+    private String dictValue;
+    @ApiModelProperty("是否折叠，true，fasle不折叠")
+    private boolean selected;
+}

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportRest.java

@@ -85,8 +85,8 @@ public class DailyReportRest implements DailyReportFeign {
     }
 
     @Override
-    public ResultBean<ReportVo> getReport(String date) {
-        return dailyReportService.getReport(date);
+    public ResultBean<ReportVo> getReport(String date,String userSid) {
+        return dailyReportService.getReport(date,userSid);
     }
 
     @Override
@@ -112,8 +112,8 @@ public class DailyReportRest implements DailyReportFeign {
     }
 
     @Override
-    public ResultBean<ReportVo> getReport2(String date, String orgPath) {
-        return dailyReportService.getReport2(date,orgPath);
+    public ResultBean<ReportVo> getReport2(String date, String orgPath,String userSid) {
+        return dailyReportService.getReport2(date,orgPath,userSid);
     }
 
     @Override
@@ -124,7 +124,7 @@ public class DailyReportRest implements DailyReportFeign {
     }
 
     @Override
-    public ResultBean<ReportVo> getReport3(String date, String orgPath) {
-        return dailyReportService.getReport3(date,orgPath);
+    public ResultBean<ReportVo> getReport3(String date, String orgPath,String userSid) {
+        return dailyReportService.getReport3(date,orgPath,userSid);
     }
 }

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java

@@ -7,6 +7,8 @@ import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfig;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.reportcenter.api.dailyreport.*;
+import com.yxt.anrui.reportcenter.api.reportset.ReportSetVo;
+import com.yxt.anrui.reportcenter.biz.reportset.ReportSetService;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
@@ -32,6 +34,8 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
 
     @Autowired
     private SysStaffOrgFeign sysStaffOrgFeign;
+    @Autowired
+    private ReportSetService reportSetService;
 
     public PagerVo<DailyReportVo> listPage(PagerQuery<DailyReportQuery> pagerQuery) {
         DailyReportQuery query = pagerQuery.getParams();
@@ -627,7 +631,7 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
         return p;
     }
 
-    public ResultBean<ReportVo> getReport(String date) {
+    public ResultBean<ReportVo> getReport(String date, String userSid) {
         ResultBean<ReportVo> rb = ResultBean.fireFail();
         QueryWrapper<DailyReport> qw = new QueryWrapper<>();
         if (StringUtils.isNotBlank(date)) {
@@ -645,6 +649,11 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
             }
         }
         reportVo.setSaleOfStockRatio(ratio);
+        ResultBean<List<ReportSetVo>> listResultBean = reportSetService.selectVoByUserSid(userSid);
+        if (listResultBean.getSuccess()) {
+            List<ReportSetVo> list = listResultBean.getData();
+            reportVo.setList(list);
+        }
         return rb.success().setData(reportVo);
     }
 
@@ -1783,13 +1792,13 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
         return p;
     }
 
-    public ResultBean<ReportVo> getReport2(String date, String orgPath) {
+    public ResultBean<ReportVo> getReport2(String date, String orgPath, String userSid) {
         ResultBean<ReportVo> rb = ResultBean.fireFail();
         QueryWrapper<DailyReport> qw = new QueryWrapper<>();
         if (StringUtils.isNotBlank(date)) {
             qw.like("createTime", date);
         }
-        if(StringUtils.isNotBlank(orgPath)){
+        if (StringUtils.isNotBlank(orgPath)) {
             List<String> stringList = Arrays.asList(orgPath.split("/"));
             String busOrgSid = orgPath.substring(37, 73);
             qw.eq("busOrgSid", busOrgSid);
@@ -1806,6 +1815,11 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
             }
         }
         reportVo.setSaleOfStockRatio(ratio);
+        ResultBean<List<ReportSetVo>> listResultBean = reportSetService.selectVoByUserSid(userSid);
+        if (listResultBean.getSuccess()) {
+            List<ReportSetVo> list = listResultBean.getData();
+            reportVo.setList(list);
+        }
         return rb.success().setData(reportVo);
     }
 
@@ -1817,7 +1831,7 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
             if (StringUtils.isNotBlank(query.getOrgPath())) {
                 List<String> stringList = Arrays.asList(query.getOrgPath().split("/"));
                 String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
-                qw.eq("useOrgSid",useOrgSid);
+                qw.eq("useOrgSid", useOrgSid);
             }
         }
         IPage<DailyReport> page = PagerUtil.queryToPage(pagerQuery);
@@ -1844,15 +1858,15 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
         return p;
     }
 
-    public ResultBean<ReportVo> getReport3(String date, String orgPath) {
+    public ResultBean<ReportVo> getReport3(String date, String orgPath, String userSid) {
         ResultBean<ReportVo> rb = ResultBean.fireFail();
         QueryWrapper<DailyReport> qw = new QueryWrapper<>();
         if (StringUtils.isNotBlank(date)) {
             qw.like("createTime", date);
         }
-        if(StringUtils.isNotBlank(orgPath)){
-            String useOrgSid= sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
-            qw.eq("useOrgSid",useOrgSid);
+        if (StringUtils.isNotBlank(orgPath)) {
+            String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+            qw.eq("useOrgSid", useOrgSid);
         }
         ReportVo reportVo = baseMapper.getReport(qw);
         String ratio = "";
@@ -1866,6 +1880,11 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
             }
         }
         reportVo.setSaleOfStockRatio(ratio);
+        ResultBean<List<ReportSetVo>> listResultBean = reportSetService.selectVoByUserSid(userSid);
+        if (listResultBean.getSuccess()) {
+            List<ReportSetVo> list = listResultBean.getData();
+            reportVo.setList(list);
+        }
         return rb.success().setData(reportVo);
     }
 }

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

@@ -0,0 +1,19 @@
+package com.yxt.anrui.reportcenter.biz.reportset;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.reportcenter.api.reportset.ReportSet;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/15
+ **/
+@Mapper
+public interface ReportSetMapper extends BaseMapper<ReportSet> {
+    int deleteByUserSid(String userSid);
+
+    ReportSet selectByUserSid(String userSid);
+}

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

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.reportcenter.biz.reportset.ReportSetMapper">
+    <delete id="deleteByUserSid">
+        delete
+        from report_set
+        where createBySid = #{userSid}
+    </delete>
+
+    <select id="selectByUserSid" resultType="com.yxt.anrui.reportcenter.api.reportset.ReportSet">
+        select *
+        from report_set
+        where createBySid = #{userSid}
+    </select>
+</mapper>

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

@@ -0,0 +1,28 @@
+package com.yxt.anrui.reportcenter.biz.reportset;
+
+import com.yxt.anrui.reportcenter.api.reportset.ReportSetFeign;
+import com.yxt.anrui.reportcenter.api.reportset.ReportSetQuery;
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/15
+ **/
+@Api(tags = "统计报表折叠设置")
+@RestController
+@RequestMapping("v1/ReportSet")
+public class ReportSetRest implements ReportSetFeign {
+
+    @Autowired
+    private ReportSetService reportSetService;
+
+    @Override
+    public ResultBean save(ReportSetQuery reportSetQuery) {
+        return reportSetService.saveSet(reportSetQuery);
+    }
+}

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

@@ -0,0 +1,163 @@
+package com.yxt.anrui.reportcenter.biz.reportset;
+
+import com.yxt.anrui.reportcenter.api.dailyreport.ReportVo;
+import com.yxt.anrui.reportcenter.api.reportset.ReportSet;
+import com.yxt.anrui.reportcenter.api.reportset.ReportSetQuery;
+import com.yxt.anrui.reportcenter.api.reportset.ReportSetVo;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/15
+ **/
+@Service
+public class ReportSetService extends MybatisBaseService<ReportSetMapper, ReportSet> {
+    public ResultBean saveSet(ReportSetQuery reportSetQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        List<ReportSetVo> reportSetVosList = reportSetQuery.getList();
+        reportSetVosList.removeAll(Collections.singleton(null));
+        if (!reportSetVosList.isEmpty()) {
+            baseMapper.deleteByUserSid(reportSetQuery.getUserSid());
+            ReportSet reportSet = new ReportSet();
+            reportSet.setCreateBySid(reportSetQuery.getUserSid());
+            for (int i = 0; i < reportSetVosList.size(); i++) {
+                ReportSetVo reportSetVo = reportSetVosList.get(i);
+                switch (reportSetVo.getDictKey()) {
+                    case "stock":
+//                        reportSet.setStock(reportSetVo.isSelected() ? 1 : 0);
+                        reportSet.setStock(1);
+                        break;
+                    case "pcOrder":
+//                        reportSet.setPcOrder(reportSetVo.isSelected() ? 1 : 0);
+                        reportSet.setPcOrder(1);
+                        break;
+                    case "reserveCar":
+//                        reportSet.setReserveCar(reportSetVo.isSelected() ? 1 : 0);
+                        reportSet.setReserveCar(1);
+                        break;
+                    case "sales":
+//                        reportSet.setSales(reportSetVo.isSelected() ? 1 : 0);
+                        reportSet.setSales(1);
+                        break;
+                    case "deliver":
+//                        reportSet.setDeliver(reportSetVo.isSelected() ? 1 : 0);
+                        reportSet.setDeliver(1);
+                        break;
+                    case "buyout":
+//                        reportSet.setBuyout(reportSetVo.isSelected() ? 1 : 0);
+                        reportSet.setBuyout(1);
+                        break;
+                    case "outbound":
+//                        reportSet.setOutbound(reportSetVo.isSelected() ? 1 : 0);
+                        reportSet.setOutbound(1);
+                        break;
+                    case "loanDis":
+//                        reportSet.setLoanDis(reportSetVo.isSelected() ? 1 : 0);
+                        reportSet.setLoanDis(1);
+                        break;
+                    default:
+                        break;
+                }
+            }
+            baseMapper.insert(reportSet);
+        }
+        return rb.success();
+    }
+
+    public ResultBean<List<ReportSetVo>> selectVoByUserSid(String userSid) {
+        ResultBean<List<ReportSetVo>> rb = ResultBean.fireFail();
+        List<ReportSetVo> list = new ArrayList<>();
+        ReportSet reportSet = baseMapper.selectByUserSid(userSid);
+        if (reportSet != null) {
+            ReportSetVo reportSetVo = new ReportSetVo();
+            reportSetVo.setDictKey("stock");
+            reportSetVo.setDictValue("库存");
+            reportSetVo.setSelected(reportSet.getStock() == 1);
+            list.add(reportSetVo);
+            reportSetVo = new ReportSetVo();
+            reportSetVo.setDictKey("pcOrder");
+            reportSetVo.setDictValue("排产");
+            reportSetVo.setSelected(reportSet.getPcOrder() == 1);
+            list.add(reportSetVo);
+            reportSetVo = new ReportSetVo();
+            reportSetVo.setDictKey("reserveCar");
+            reportSetVo.setDictValue("订车");
+            reportSetVo.setSelected(reportSet.getReserveCar() == 1);
+            list.add(reportSetVo);
+            reportSetVo = new ReportSetVo();
+            reportSetVo.setDictKey("sales");
+            reportSetVo.setDictValue("销售");
+            reportSetVo.setSelected(reportSet.getSales() == 1);
+            list.add(reportSetVo);
+            reportSetVo = new ReportSetVo();
+            reportSetVo.setDictKey("deliver");
+            reportSetVo.setDictValue("交付");
+            reportSetVo.setSelected(reportSet.getDeliver() == 1);
+            list.add(reportSetVo);
+            reportSetVo = new ReportSetVo();
+            reportSetVo.setDictKey("buyout");
+            reportSetVo.setDictValue("买断");
+            reportSetVo.setSelected(reportSet.getBuyout() == 1);
+            list.add(reportSetVo);
+            reportSetVo = new ReportSetVo();
+            reportSetVo.setDictKey("outbound");
+            reportSetVo.setDictValue("欠款出库");
+            reportSetVo.setSelected(reportSet.getOutbound() == 1);
+            list.add(reportSetVo);
+            reportSetVo = new ReportSetVo();
+            reportSetVo.setDictKey("loanDis");
+            reportSetVo.setDictValue("金融未放款");
+            reportSetVo.setSelected(reportSet.getLoanDis() == 1);
+            list.add(reportSetVo);
+        } else {
+            ReportSetVo reportSetVo = new ReportSetVo();
+            reportSetVo.setDictKey("stock");
+            reportSetVo.setDictValue("库存");
+            reportSetVo.setSelected(false);
+            list.add(reportSetVo);
+            reportSetVo = new ReportSetVo();
+            reportSetVo.setDictKey("pcOrder");
+            reportSetVo.setDictValue("排产");
+            reportSetVo.setSelected(false);
+            list.add(reportSetVo);
+            reportSetVo = new ReportSetVo();
+            reportSetVo.setDictKey("reserveCar");
+            reportSetVo.setDictValue("订车");
+            reportSetVo.setSelected(false);
+            list.add(reportSetVo);
+            reportSetVo = new ReportSetVo();
+            reportSetVo.setDictKey("sales");
+            reportSetVo.setDictValue("销售");
+            reportSetVo.setSelected(false);
+            list.add(reportSetVo);
+            reportSetVo = new ReportSetVo();
+            reportSetVo.setDictKey("deliver");
+            reportSetVo.setDictValue("交付");
+            reportSetVo.setSelected(false);
+            list.add(reportSetVo);
+            reportSetVo = new ReportSetVo();
+            reportSetVo.setDictKey("buyout");
+            reportSetVo.setDictValue("买断");
+            reportSetVo.setSelected(false);
+            list.add(reportSetVo);
+            reportSetVo = new ReportSetVo();
+            reportSetVo.setDictKey("outbound");
+            reportSetVo.setDictValue("欠款出库");
+            reportSetVo.setSelected(false);
+            list.add(reportSetVo);
+            reportSetVo = new ReportSetVo();
+            reportSetVo.setDictKey("loanDis");
+            reportSetVo.setDictValue("金融未放款");
+            reportSetVo.setSelected(false);
+            list.add(reportSetVo);
+        }
+        return rb.success().setData(list);
+    }
+}

anrui-riskcenter-ui/src/views/advancerequest/advancerequestAdd.vue

@@ -58,7 +58,7 @@
             <el-table-column prop="vinNo" label="车架号" align="center" width="100" />
             <el-table-column prop="bankName" label="资方" align="center" width="100" />
             <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="140" />
-            <el-table-column prop="customer" label="客户名称" align="center" width="130" />
+            <el-table-column prop="customerName" label="客户名称" align="center" width="130" />
             <el-table-column prop="borrowerName" label="贷款人" align="center" width="100" />
             <el-table-column prop="period" label="期数" align="center" width="80" />
             <el-table-column prop="sysBeMoney" label="平台逾期月还" align="center" width="140" />

anrui-riskcenter-ui/src/views/advancerequest/advancerequestInfo.vue

@@ -51,7 +51,7 @@
             <el-table-column prop="vinNo" label="车架号" align="center" width="100" />
             <el-table-column prop="bankName" label="资方" align="center" width="100" />
             <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="160" />
-            <el-table-column prop="customer" label="客户名称" align="center" width="130" />
+            <el-table-column prop="customerName" label="客户名称" align="center" width="130" />
             <el-table-column prop="borrowerName" label="贷款人" align="center" width="100" />
             <el-table-column prop="period" label="期数" align="center" width="100" />
             <el-table-column prop="sysBeMoney" label="平台逾期月还" align="center" width="120" />

anrui-riskcenter-ui/src/views/agentbusiness/agentbusiness.vue

@@ -57,21 +57,22 @@
                 <span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="分公司" align="center">
+            <el-table-column label="分公司" align="center" width="130">
               <template slot-scope="scope">
                 <span>{{ scope.row.company }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="申请人" align="center" width="100">
+            <el-table-column label="申请部门" align="center" width="130">
               <template slot-scope="scope">
-                <span>{{ scope.row.applyName }}</span>
+                <span>{{ scope.row.dept }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="申请部门" align="center">
+            <el-table-column label="申请人" align="center" width="100">
               <template slot-scope="scope">
-                <span>{{ scope.row.dept }}</span>
+                <span>{{ scope.row.applyName }}</span>
               </template>
             </el-table-column>
+
             <el-table-column label="申请日期" align="center" width="100">
               <template slot-scope="scope">
                 <span>{{ scope.row.applyDate }}</span>
@@ -82,7 +83,7 @@
                 <span>{{ scope.row.closingDate }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="申请编号" align="center" width="165">
+            <el-table-column label="申请编号" align="center" width="180">
               <template slot-scope="scope">
                 <span>{{ scope.row.billNo }}</span>
               </template>

anrui-riskcenter-ui/src/views/agentbusiness/agentbusinessAdd.vue

@@ -55,19 +55,19 @@
           <el-table :key="tableKey" :data="formobj.records" :index="index" border style="width: 100%">
             <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
             <el-table-column prop="vinNo" label="车架号" align="center" width="100" />
-            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="140"/>
+            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="160"/>
             <el-table-column prop="bankName" label="资方" align="center" width="100" />
-            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="140" />
+            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="160" />
             <el-table-column prop="customer" label="客户名称" align="center" width="100" />
-            <el-table-column prop="borrowerName" label="贷款人" align="center" width="100" />
+            <el-table-column prop="borrowerName" label="贷款人" align="center" min-width="100" />
             <el-table-column prop="period" label="期数" align="center" width="80" />
             <el-table-column prop="actualDate" label="实还日期" align="center" width="120" />
             <el-table-column prop="actualMoney" label="实还金额" align="center" width="120" />
-            <el-table-column label="息差" align="center" min-width="130">
-              <template slot-scope="scope">
-                <el-input v-model="scope.row.spread" clearable placeholder="" />
-              </template>
-            </el-table-column>
+<!--            <el-table-column label="息差" align="center" min-width="130">-->
+<!--              <template slot-scope="scope">-->
+<!--                <el-input v-model="scope.row.spread" clearable placeholder="" />-->
+<!--              </template>-->
+<!--            </el-table-column>-->
             <el-table-column label="转付资方月还" align="center" width="130">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.transferPrincipal" clearable placeholder="" />
@@ -78,12 +78,12 @@
                 <el-input v-model="scope.row.defaultInterest" clearable placeholder="" />
               </template>
             </el-table-column>
-            <el-table-column label="收款账户" align="center" width="130">
+            <el-table-column label="收款账户" align="center" width="250">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.account" clearable placeholder="" />
               </template>
             </el-table-column>
-            <el-table-column label="收款账号" align="center" width="130">
+            <el-table-column label="收款账号" align="center" width="250">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.accountNumber" clearable placeholder="" />
               </template>
@@ -98,7 +98,7 @@
 <script>
 import req from '@/api/agentbusiness/agentbusiness'
 import uploadImg from '@/components/uploadFile/uploadImg'
-import { typeValues, listByPayment } from '@/api/Common/dictcommons'
+import { typeValues } from '@/api/Common/dictcommons'
 
 export default {
   name: 'AgentBusinessAdd',

anrui-riskcenter-ui/src/views/agentbusiness/agentbusinessInfo.vue

@@ -48,19 +48,19 @@
           <el-table :key="tableKey" :data="formobj.records" :index="index" border style="width: 100%">
             <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
             <el-table-column prop="vinNo" label="车架号" align="center" width="100" />
-            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="140"/>
+            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="160"/>
             <el-table-column prop="bankName" label="资方" align="center" width="100" />
-            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="140" />
+            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="160" />
             <el-table-column prop="customer" label="客户名称" align="center" width="100" />
-            <el-table-column prop="borrowerName" label="贷款人" align="center" width="100" />
+            <el-table-column prop="borrowerName" label="贷款人" align="center" min-width="100" />
             <el-table-column prop="period" label="期数" align="center" width="80" />
             <el-table-column prop="actualDate" label="实还日期" align="center" width="120" />
             <el-table-column prop="actualMoney" label="实还金额" align="center" width="120" />
-            <el-table-column prop="spread" label="息差" align="center" min-width="130" />
+<!--            <el-table-column prop="spread" label="息差" align="center" min-width="130" />-->
             <el-table-column prop="transferPrincipal" label="转付资方月还" align="center" width="130" />
             <el-table-column prop="defaultInterest" label="转付资方逾期利息" align="center" width="150" />
-            <el-table-column prop="account" label="转付账户" align="center" width="130" />
-            <el-table-column prop="accountNumber" label="转付账号" align="center" width="130" />
+            <el-table-column prop="account" label="转付账户" align="center" width="200" />
+            <el-table-column prop="accountNumber" label="转付账号" align="center" width="200" />
           </el-table>
         </el-form>
       </div>

anrui-riskcenter-ui/src/views/collectionmeasures/collectionmeasures.vue

@@ -18,6 +18,12 @@
               <el-form-item label="申请部门">
                 <el-input v-model="listQuery.params.deptName" placeholder="" clearable/>
               </el-form-item>
+              <el-form-item label="措施">
+                <el-select v-model="listQuery.params.collMeasure" filterable placeholder="请选择" clearable multiple>
+                  <el-option v-for="item in collMeasure_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue">
+                  </el-option>
+                </el-select>
+              </el-form-item>
               <el-form-item label="申请日期">
                 <el-date-picker v-model="listQuery.params.createStartTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
                 <span style="padding: 0 8px">至</span>
@@ -160,6 +166,24 @@ export default {
       tableKey: 0,
       list: [],
       sids: [], // 用于导出的时候保存已选择的SIDs
+      collMeasure_list: [
+        {
+          dictKey: '0',
+          dictValue: '上征信'
+        },
+        {
+          dictKey: '1',
+          dictValue: '远程控制'
+        },
+        {
+          dictKey: '2',
+          dictValue: '签订还款协议'
+        },
+        {
+          dictKey: '3',
+          dictValue: '增加担保人'
+        }
+      ],
       FormLoading: false,
       listLoading: false,
       // 翻页
@@ -168,7 +192,7 @@ export default {
         size: 10,
         total: 0,
         params: {
-          collMeasure: '',
+          collMeasure: [],
           createByName: '',
           createEndTime: '',
           createStartTime: '',
@@ -286,7 +310,7 @@ export default {
         size: 10,
         total: 0,
         params: {
-          collMeasure: '',
+          collMeasure: [],
           createByName: '',
           createEndTime: '',
           createStartTime: '',

anrui-riskcenter-ui/src/views/collectionmeasures/collectionmeasuresAdd.vue

@@ -57,14 +57,14 @@
           </div>
           <el-table :key="tableKey" :data="formobj.loanBeCollectionVehDetails" :index="index" border style="width: 100%">
             <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="120" />
-            <el-table-column prop="vinNo" label="车架号" align="center" />
+            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="160" />
+            <el-table-column prop="vinNo" label="车架号" align="center" width="120"/>
             <el-table-column prop="carNum" label="车牌号" align="center" width="100" />
             <el-table-column prop="bankName" label="资方" align="center" width="100" />
-            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="120"/>
+            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="160"/>
             <el-table-column prop="custName" label="客户名称" align="center" width="100" />
-            <el-table-column prop="custPhone" label="联系电话" align="center" width="100"/>
-            <el-table-column prop="borrowerName" label="贷款人" align="center" width="100"/>
+<!--            <el-table-column prop="custPhone" label="联系电话" align="center" width="100"/>-->
+            <el-table-column prop="borrowerName" label="贷款人" align="center" min-width="100"/>
             <el-table-column prop="firstBeDate" label="首次逾期日期" align="center" width="120"/>
             <el-table-column prop="beOverduePeriod" label="逾期期数" align="center" width="100" />
             <el-table-column prop="beOverdueMoney" label="逾期金额" align="center" width="100" />

anrui-riskcenter-ui/src/views/collectionmeasures/collectionmeasuresInfo.vue

@@ -48,14 +48,14 @@
           </div>
           <el-table :key="tableKey" :data="formobj.loanBeCollectionVehDetails" :index="index" border style="width: 100%">
             <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="120" />
-            <el-table-column prop="vinNo" label="车架号" align="center" />
+            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="160" />
+            <el-table-column prop="vinNo" label="车架号" align="center" width="120"/>
             <el-table-column prop="carNum" label="车牌号" align="center" width="100" />
             <el-table-column prop="bankName" label="资方" align="center" width="100" />
-            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="120"/>
+            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="160"/>
             <el-table-column prop="custName" label="客户名称" align="center" width="100" />
-            <el-table-column prop="custPhone" label="联系电话" align="center" width="100"/>
-            <el-table-column prop="borrowerName" label="贷款人" align="center" width="100"/>
+            <!--            <el-table-column prop="custPhone" label="联系电话" align="center" width="100"/>-->
+            <el-table-column prop="borrowerName" label="贷款人" align="center" min-width="100"/>
             <el-table-column prop="firstBeDate" label="首次逾期日期" align="center" width="120"/>
             <el-table-column prop="beOverduePeriod" label="逾期期数" align="center" width="100" />
             <el-table-column prop="beOverdueMoney" label="逾期金额" align="center" width="100" />

anrui-riskcenter-ui/src/views/overduevehicle/overduevehicle.vue

@@ -49,7 +49,7 @@
               </el-form-item>
               <el-form-item label="远程控制状态">
                 <el-select v-model="listQuery.params.lockCarState" clearable placeholder="请选择" filterable>
-                  <el-option v-for="item in lockCarState_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
+                  <el-option v-for="item in lockCarState_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -70,12 +70,12 @@
           <el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" style="width: 100%;" @selection-change="handleSelectionChange">
             <el-table-column type="selection" align="center" width="50"/>
             <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center"/>
-            <el-table-column prop="useOrgName" label="分公司" align="center" width="110"/>
-            <el-table-column prop="dept" label="销售部门" align="center" width="100"/>
+            <el-table-column prop="useOrgName" label="分公司" align="center" width="130"/>
+            <el-table-column prop="dept" label="销售部门" align="center" width="130"/>
             <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="165"/>
             <el-table-column prop="vinNo" label="车架号" align="center" width="100"/>
             <el-table-column prop="carNum" label="车牌号" align="center" width="100"/>
-            <el-table-column prop="borrowerName" label="贷款人" align="center" width="100"/>
+            <el-table-column prop="borrowerName" label="贷款人" align="center" min-width="100"/>
             <el-table-column prop="repaymentName" label="还款操作人" align="center" width="150"/>
             <el-table-column prop="beOverduePeriod" label="逾期期数" align="center" width="100"/>
             <el-table-column prop="beOverdueMoney" label="逾期金额" align="center" width="100"/>
@@ -173,6 +173,10 @@ export default {
       list: [],
       sids: [], // 用于导出的时候保存已选择的SIDs
       lockCarState_list: [
+        {
+          dictKey: '0',
+          dictValue: '未控制'
+        },
         {
           dictKey: '1',
           dictValue: '控制成功'
@@ -180,6 +184,10 @@ export default {
         {
           dictKey: '2',
           dictValue: '控制失败'
+        },
+        {
+          dictKey: '3',
+          dictValue: '已解控'
         }
       ],
       user_list: [],

anrui-riskcenter-ui/src/views/overduevehicle/overduevehicleByRisk.vue

@@ -49,7 +49,7 @@
               </el-form-item>
               <el-form-item label="远程控制状态">
                 <el-select v-model="listQuery.params.lockCarState" clearable placeholder="请选择" filterable>
-                  <el-option v-for="item in lockCarState_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
+                  <el-option v-for="item in lockCarState_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -70,12 +70,12 @@
           <el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" style="width: 100%;" @selection-change="handleSelectionChange">
             <el-table-column type="selection" align="center" width="50"/>
             <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center"/>
-            <el-table-column prop="useOrgName" label="分公司" align="center" width="110"/>
-            <el-table-column prop="dept" label="销售部门" align="center" width="100"/>
+            <el-table-column prop="useOrgName" label="分公司" align="center" width="130"/>
+            <el-table-column prop="dept" label="销售部门" align="center" width="130"/>
             <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="165"/>
             <el-table-column prop="vinNo" label="车架号" align="center" width="100"/>
             <el-table-column prop="carNum" label="车牌号" align="center" width="100"/>
-            <el-table-column prop="borrowerName" label="贷款人" align="center" width="100"/>
+            <el-table-column prop="borrowerName" label="贷款人" align="center" min-width="100"/>
             <el-table-column prop="repaymentName" label="还款操作人" align="center" width="150"/>
             <el-table-column prop="beOverduePeriod" label="逾期期数" align="center" width="100"/>
             <el-table-column prop="beOverdueMoney" label="逾期金额" align="center" width="100"/>
@@ -241,6 +241,10 @@ export default {
       list: [],
       sids: [], // 用于导出的时候保存已选择的SIDs
       lockCarState_list: [
+        {
+          dictKey: '0',
+          dictValue: '未控制'
+        },
         {
           dictKey: '1',
           dictValue: '控制成功'
@@ -248,6 +252,10 @@ export default {
         {
           dictKey: '2',
           dictValue: '控制失败'
+        },
+        {
+          dictKey: '3',
+          dictValue: '已解控'
         }
       ],
       FormLoading: false,

anrui-riskcenter-ui/src/views/overduevehicle/vehiclecollectionentry.vue

@@ -40,7 +40,7 @@
             <el-table-column prop="carNum" label="车牌号" align="center" width="100" />
             <el-table-column prop="custNameAndPhone" label="客户及电话" align="center" width="140" />
             <el-table-column prop="reaRepaymentNameAndPhone" label="还款操作人及电话" align="center" width="170" />
-            <el-table-column prop="loanContractNo" label="贷款合同号" align="center" width="140"/>
+            <el-table-column prop="loanContractNo" label="贷款合同号" align="center" width="160"/>
             <el-table-column prop="bankName" label="资方" align="center" width="100" />
             <el-table-column prop="firstBeDate" label="首次逾期日期" align="center" width="140" />
             <el-table-column prop="beOverduePeriod" label="逾期期数" align="center" width="100" />
@@ -158,7 +158,7 @@
     <!-- 查看家访考察报告 -->
     <homevisitreport v-show="viewState == 6" ref="divReport" @doback="resetState"/>
     <!-- 查看家访资料 -->
-    <materialInfo v-show="viewState == 7" ref="divaMterial" @doback="resetState"/>
+    <materialInfo v-show="viewState == 7" ref="divMterial" @doback="resetState"/>
   </div>
 </template>
 
@@ -393,6 +393,10 @@ export default {
       xhr.send()
     },
     saveOrUpdate() {
+      if (this.formobj.loanBeCollectionRecordVehInitList.length === 0) {
+        this.$message({ showClose: true, type: 'error', message: '车辆列表不能为空' })
+        return
+      }
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
           this.submitdisabled = true

anrui-riskcenter-ui/src/views/workFlow/cuishoucuoshiFlow/collectionmeasuresDaiBan.vue

@@ -51,14 +51,14 @@
           </div>
           <el-table :key="tableKey" :data="formobj.loanBeCollectionVehDetails" :index="index" border style="width: 100%">
             <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="120" />
-            <el-table-column prop="vinNo" label="车架号" align="center" />
+            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="160" />
+            <el-table-column prop="vinNo" label="车架号" align="center" width="120"/>
             <el-table-column prop="carNum" label="车牌号" align="center" width="100" />
             <el-table-column prop="bankName" label="资方" align="center" width="100" />
-            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="120"/>
+            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="160"/>
             <el-table-column prop="custName" label="客户名称" align="center" width="100" />
-            <el-table-column prop="custPhone" label="联系电话" align="center" width="100"/>
-            <el-table-column prop="borrowerName" label="贷款人" align="center" width="100"/>
+            <!--            <el-table-column prop="custPhone" label="联系电话" align="center" width="100"/>-->
+            <el-table-column prop="borrowerName" label="贷款人" align="center" min-width="100"/>
             <el-table-column prop="firstBeDate" label="首次逾期日期" align="center" width="120"/>
             <el-table-column prop="beOverduePeriod" label="逾期期数" align="center" width="100" />
             <el-table-column prop="beOverdueMoney" label="逾期金额" align="center" width="100" />

anrui-riskcenter-ui/src/views/workFlow/cuishoucuoshiFlow/collectionmeasuresEdit.vue

@@ -56,14 +56,14 @@
           </div>
           <el-table :key="tableKey" :data="formobj.loanBeCollectionVehDetails" :index="index" border style="width: 100%">
             <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="120" />
-            <el-table-column prop="vinNo" label="车架号" align="center" />
+            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="160" />
+            <el-table-column prop="vinNo" label="车架号" align="center" width="120"/>
             <el-table-column prop="carNum" label="车牌号" align="center" width="100" />
             <el-table-column prop="bankName" label="资方" align="center" width="100" />
-            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="120"/>
+            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="160"/>
             <el-table-column prop="custName" label="客户名称" align="center" width="100" />
-            <el-table-column prop="custPhone" label="联系电话" align="center" width="100"/>
-            <el-table-column prop="borrowerName" label="贷款人" align="center" width="100"/>
+            <!--            <el-table-column prop="custPhone" label="联系电话" align="center" width="100"/>-->
+            <el-table-column prop="borrowerName" label="贷款人" align="center" min-width="100"/>
             <el-table-column prop="firstBeDate" label="首次逾期日期" align="center" width="120"/>
             <el-table-column prop="beOverduePeriod" label="逾期期数" align="center" width="100" />
             <el-table-column prop="beOverdueMoney" label="逾期金额" align="center" width="100" />

anrui-riskcenter-ui/src/views/workFlow/cuishoucuoshiFlow/collectionmeasuresYiBan.vue

@@ -48,14 +48,14 @@
           </div>
           <el-table :key="tableKey" :data="formobj.loanBeCollectionVehDetails" :index="index" border style="width: 100%">
             <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="120" />
-            <el-table-column prop="vinNo" label="车架号" align="center" />
+            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="160" />
+            <el-table-column prop="vinNo" label="车架号" align="center" width="120"/>
             <el-table-column prop="carNum" label="车牌号" align="center" width="100" />
             <el-table-column prop="bankName" label="资方" align="center" width="100" />
-            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="120"/>
+            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="160"/>
             <el-table-column prop="custName" label="客户名称" align="center" width="100" />
-            <el-table-column prop="custPhone" label="联系电话" align="center" width="100"/>
-            <el-table-column prop="borrowerName" label="贷款人" align="center" width="100"/>
+            <!--            <el-table-column prop="custPhone" label="联系电话" align="center" width="100"/>-->
+            <el-table-column prop="borrowerName" label="贷款人" align="center" min-width="100"/>
             <el-table-column prop="firstBeDate" label="首次逾期日期" align="center" width="120"/>
             <el-table-column prop="beOverduePeriod" label="逾期期数" align="center" width="100" />
             <el-table-column prop="beOverdueMoney" label="逾期金额" align="center" width="100" />

anrui-riskcenter-ui/src/views/workFlow/daishoudaifuFlow/agentbusinessDaiBan.vue

@@ -51,19 +51,19 @@
           <el-table :key="tableKey" :data="formobj.records" :index="index" border style="width: 100%">
             <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
             <el-table-column prop="vinNo" label="车架号" align="center" width="100" />
-            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="140"/>
+            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="160"/>
             <el-table-column prop="bankName" label="资方" align="center" width="100" />
-            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="140" />
+            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="160" />
             <el-table-column prop="customer" label="客户名称" align="center" width="100" />
-            <el-table-column prop="borrowerName" label="贷款人" align="center" width="100" />
+            <el-table-column prop="borrowerName" label="贷款人" align="center" min-width="100" />
             <el-table-column prop="period" label="期数" align="center" width="80" />
             <el-table-column prop="actualDate" label="实还日期" align="center" width="120" />
             <el-table-column prop="actualMoney" label="实还金额" align="center" width="120" />
-            <el-table-column prop="spread" label="息差" align="center" min-width="130" />
+            <!--            <el-table-column prop="spread" label="息差" align="center" min-width="130" />-->
             <el-table-column prop="transferPrincipal" label="转付资方月还" align="center" width="130" />
             <el-table-column prop="defaultInterest" label="转付资方逾期利息" align="center" width="150" />
-            <el-table-column prop="account" label="转付账户" align="center" width="130" />
-            <el-table-column prop="accountNumber" label="转付账号" align="center" width="130" />
+            <el-table-column prop="account" label="转付账户" align="center" width="200" />
+            <el-table-column prop="accountNumber" label="转付账号" align="center" width="200" />
           </el-table>
         </el-form>
       </div>

anrui-riskcenter-ui/src/views/workFlow/daishoudaifuFlow/agentbusinessEdit.vue

@@ -54,19 +54,19 @@
           <el-table :key="tableKey" :data="formobj.records" :index="index" border style="width: 100%">
             <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
             <el-table-column prop="vinNo" label="车架号" align="center" width="100" />
-            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="140"/>
+            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="160"/>
             <el-table-column prop="bankName" label="资方" align="center" width="100" />
-            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="140" />
+            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="160" />
             <el-table-column prop="customer" label="客户名称" align="center" width="100" />
-            <el-table-column prop="borrowerName" label="贷款人" align="center" width="100" />
+            <el-table-column prop="borrowerName" label="贷款人" align="center" min-width="100" />
             <el-table-column prop="period" label="期数" align="center" width="80" />
             <el-table-column prop="actualDate" label="实还日期" align="center" width="120" />
             <el-table-column prop="actualMoney" label="实还金额" align="center" width="120" />
-            <el-table-column label="息差" align="center" min-width="130">
-              <template slot-scope="scope">
-                <el-input v-model="scope.row.spread" clearable placeholder="" />
-              </template>
-            </el-table-column>
+            <!--            <el-table-column label="息差" align="center" min-width="130">-->
+            <!--              <template slot-scope="scope">-->
+            <!--                <el-input v-model="scope.row.spread" clearable placeholder="" />-->
+            <!--              </template>-->
+            <!--            </el-table-column>-->
             <el-table-column label="转付资方月还" align="center" width="130">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.transferPrincipal" clearable placeholder="" />
@@ -77,12 +77,12 @@
                 <el-input v-model="scope.row.defaultInterest" clearable placeholder="" />
               </template>
             </el-table-column>
-            <el-table-column label="收款账户" align="center" width="130">
+            <el-table-column label="收款账户" align="center" width="250">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.account" clearable placeholder="" />
               </template>
             </el-table-column>
-            <el-table-column label="收款账号" align="center" width="130">
+            <el-table-column label="收款账号" align="center" width="250">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.accountNumber" clearable placeholder="" />
               </template>
@@ -97,7 +97,7 @@
 <script>
 import req from '@/api/agentbusiness/agentbusiness'
 import uploadImg from '@/components/uploadFile/uploadImg'
-import { typeValues, listByPayment } from '@/api/Common/dictcommons'
+import { typeValues } from '@/api/Common/dictcommons'
 
 export default {
   name: 'AgentBusinessEdit',

anrui-riskcenter-ui/src/views/workFlow/daishoudaifuFlow/agentbusinessYiBan.vue

@@ -48,19 +48,19 @@
           <el-table :key="tableKey" :data="formobj.records" :index="index" border style="width: 100%">
             <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
             <el-table-column prop="vinNo" label="车架号" align="center" width="100" />
-            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="140"/>
+            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="160"/>
             <el-table-column prop="bankName" label="资方" align="center" width="100" />
-            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="140" />
+            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="160" />
             <el-table-column prop="customer" label="客户名称" align="center" width="100" />
-            <el-table-column prop="borrowerName" label="贷款人" align="center" width="100" />
+            <el-table-column prop="borrowerName" label="贷款人" align="center" min-width="100" />
             <el-table-column prop="period" label="期数" align="center" width="80" />
             <el-table-column prop="actualDate" label="实还日期" align="center" width="120" />
             <el-table-column prop="actualMoney" label="实还金额" align="center" width="120" />
-            <el-table-column prop="spread" label="息差" align="center" min-width="130" />
+            <!--            <el-table-column prop="spread" label="息差" align="center" min-width="130" />-->
             <el-table-column prop="transferPrincipal" label="转付资方月还" align="center" width="130" />
             <el-table-column prop="defaultInterest" label="转付资方逾期利息" align="center" width="150" />
-            <el-table-column prop="account" label="转付账户" align="center" width="130" />
-            <el-table-column prop="accountNumber" label="转付账号" align="center" width="130" />
+            <el-table-column prop="account" label="转付账户" align="center" width="200" />
+            <el-table-column prop="accountNumber" label="转付账号" align="center" width="200" />
           </el-table>
         </el-form>
       </div>

anrui-riskcenter-ui/src/views/workFlow/diankuanFlow/advancerequestDaiBan.vue

@@ -54,7 +54,7 @@
             <el-table-column prop="vinNo" label="车架号" align="center" width="100" />
             <el-table-column prop="bankName" label="资方" align="center" width="100" />
             <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="160" />
-            <el-table-column prop="customer" label="客户名称" align="center" width="130" />
+            <el-table-column prop="customerName" label="客户名称" align="center" width="130" />
             <el-table-column prop="borrowerName" label="贷款人" align="center" width="100" />
             <el-table-column prop="period" label="期数" align="center" width="100" />
             <el-table-column prop="sysBeMoney" label="平台逾期月还" align="center" width="120" />

anrui-riskcenter-ui/src/views/workFlow/diankuanFlow/advancerequestEdit.vue

@@ -57,7 +57,7 @@
             <el-table-column prop="vinNo" label="车架号" align="center" width="100" />
             <el-table-column prop="bankName" label="资方" align="center" width="100" />
             <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="140" />
-            <el-table-column prop="customer" label="客户名称" align="center" width="130" />
+            <el-table-column prop="customerName" label="客户名称" align="center" width="130" />
             <el-table-column prop="borrowerName" label="贷款人" align="center" width="100" />
             <el-table-column prop="period" label="期数" align="center" width="80" />
             <el-table-column prop="sysBeMoney" label="平台逾期月还" align="center" width="140" />

anrui-riskcenter-ui/src/views/workFlow/diankuanFlow/advancerequestYiBan.vue

@@ -51,7 +51,7 @@
             <el-table-column prop="vinNo" label="车架号" align="center" width="100" />
             <el-table-column prop="bankName" label="资方" align="center" width="100" />
             <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="160" />
-            <el-table-column prop="customer" label="客户名称" align="center" width="130" />
+            <el-table-column prop="customerName" label="客户名称" align="center" width="130" />
             <el-table-column prop="borrowerName" label="贷款人" align="center" width="100" />
             <el-table-column prop="period" label="期数" align="center" width="100" />
             <el-table-column prop="sysBeMoney" label="平台逾期月还" align="center" width="120" />

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyQuery.java

@@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * Project: anrui-riskcenter(催收措施申请) <br/>
  * File: LoanBeCollectionApplyQuery.java <br/>
@@ -64,7 +66,7 @@ public class LoanBeCollectionApplyQuery implements Query {
     @ApiModelProperty("办结结束日期")
     private String modifyEndTime;
     @ApiModelProperty("催收措施")
-    private String collMeasure;
+    private List<String> collMeasure;
 
     private String userSid;
     private String orgPath;

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-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbeoverdueveh/LoanBeOverdueVehQuery.java

@@ -37,6 +37,8 @@ public class LoanBeOverdueVehQuery implements Query {
     private String collectionEndDate;
     @ApiModelProperty("风控专员")
     private String riskStaffName;
+    @ApiModelProperty("远程控制状态")
+    private String lockCarState;
     @ApiModelProperty("是否分配")
     private Boolean isFP = false;
 

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/LoanBePadsincereApplyQuery.java

@@ -56,8 +56,8 @@ public class LoanBePadsincereApplyQuery implements Query {
     private String useOrgName;
     @ApiModelProperty("创建人")
     private String createByName;
-    @ApiModelProperty("申请编号")
-    private String billNo;
+    @ApiModelProperty("申请部门")
+    private String deptName;
     @ApiModelProperty("申请开始日期")
     private String createStartTime;
     @ApiModelProperty("申请结束日期")

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

@@ -206,8 +206,11 @@ public class LoanBeCollectionApplyService extends MybatisBaseService<LoanBeColle
         qw.apply(StringUtils.isNotBlank(query.getModifyStartTime()), "date_format (modifyTime,'%Y-%m-%d') >= date_format('" + query.getModifyStartTime() + "','%Y-%m-%d')").
                 apply(StringUtils.isNotBlank(query.getModifyEndTime()), "date_format (modifyTime,'%Y-%m-%d') <= date_format('" + query.getModifyEndTime() + "','%Y-%m-%d')"
                 );
-        if (StringUtils.isNotBlank(query.getCollMeasure())) {
-            qw.like("collMeasure", query.getCollMeasure());
+        List<String> collMeasure = query.getCollMeasure();
+        if (collMeasure != null && collMeasure.size() > 0) {
+            for (String s : collMeasure) {
+                qw.like("collMeasure", s);
+            }
         }
         qw.orderByDesc("createTime");
         IPage<LoanBeCollectionApply> page = PagerUtil.queryToPage(pq);
@@ -257,7 +260,7 @@ public class LoanBeCollectionApplyService extends MybatisBaseService<LoanBeColle
             }
             for (LoanBeCollectionVehDto loanBeCollectionVehDetail : loanBeCollectionVehDetails) {
                 List<String> collMeasures = dto.getCollMeasures();
-                if (!collMeasures.contains("远程控制")){
+                if (!collMeasures.contains("远程控制")) {
                     loanBeCollectionVehDetail.setLockCarMoney("0");
                 }
                 loanBeCollectionVehDetail.setMainSid(sid);
@@ -371,13 +374,13 @@ public class LoanBeCollectionApplyService extends MybatisBaseService<LoanBeColle
         List<LoanBeCollectionVehDetailsVo> loanBeCollectionVehDetailsVos = loanBeCollectionVehService.selByMainSid(sid);
         for (LoanBeCollectionVehDetailsVo loanBeCollectionVehDetailsVo : loanBeCollectionVehDetailsVos) {
             String lockCarState = loanBeCollectionVehDetailsVo.getLockCarState();
-            if ("0".equals(lockCarState)){
+            if ("0".equals(lockCarState)) {
                 loanBeCollectionVehDetailsVo.setLockCarState("待控制");
-            }else if ("1".equals(lockCarState)){
+            } else if ("1".equals(lockCarState)) {
                 loanBeCollectionVehDetailsVo.setLockCarState("控制成功");
-            }else if ("2".equals(lockCarState)){
+            } else if ("2".equals(lockCarState)) {
                 loanBeCollectionVehDetailsVo.setLockCarState("控制失败");
-            }else if ("3".equals(lockCarState)){
+            } else if ("3".equals(lockCarState)) {
                 loanBeCollectionVehDetailsVo.setLockCarState("已解控");
             }
             List<LoanFile> loanFiles1 = loanFileService.selectByLinkSid(loanBeCollectionVehDetailsVo.getSid(), LoanFileEnum.BECOLLECTIONVEHHKXY.getAttachType());
@@ -456,14 +459,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[i]);
-            }else {
-                loanBeCollectionVehDetailsVo.setLockCarMoney(parameterValues[2]);
                 yckzVinNo = yckzVinNo + loanBeCollectionVehDetailsVo.getVinNo() + ',';
             }
             List<LoanBeCollectionVehFile> loanBeCollectionVehFiles = new ArrayList<>();
@@ -504,8 +509,8 @@ public class LoanBeCollectionApplyService extends MybatisBaseService<LoanBeColle
             loanBeCollectionVehDetailsVo.setSids(loanBeCollectionVehFiles);
             loanBeCollectionVehDetailsVos.add(loanBeCollectionVehDetailsVo);
         }
-        if (StringUtils.isNotBlank(yckzVinNo)){
-            loanBeCollectionApplyDetailsVo.setLockCarRemarks("注：车架号" + yckzVinNo.substring(0,yckzVinNo.lastIndexOf(",")) + "已超过制度规定的远程控制次数，应要求客户全部结清车款。");
+        if (StringUtils.isNotBlank(yckzVinNo)) {
+            loanBeCollectionApplyDetailsVo.setLockCarRemarks("注：车架号" + yckzVinNo.substring(0, yckzVinNo.lastIndexOf(",")) + "已超过制度规定的远程控制次数，应要求客户全部结清车款。");
         }
         loanBeCollectionApplyDetailsVo.setLoanBeCollectionVehDetails(loanBeCollectionVehDetailsVos);
         return loanBeCollectionApplyDetailsVo;
@@ -515,10 +520,10 @@ public class LoanBeCollectionApplyService extends MybatisBaseService<LoanBeColle
         ResultBean rb = ResultBean.fireFail();
         List<String> collMeasures = dto.getCollMeasures();
         List<LoanBeCollectionVehDto> loanBeCollectionVehDetails = dto.getLoanBeCollectionVehDetails();
-        if (collMeasures.contains("远程控制")){
+        if (collMeasures.contains("远程控制")) {
             for (LoanBeCollectionVehDto loanBeCollectionVehDetail : loanBeCollectionVehDetails) {
                 int i = loanBeCollectionVehService.selKzStateBySaleVehSid(loanBeCollectionVehDetail.getSaleVehSid());
-                if (i > 0){
+                if (i > 0) {
                     return rb.setMsg("车架号" + loanBeCollectionVehDetail.getVinNo() + "已存在审批中(待控制/控制成功)，不可再次勾选远程控制措施。");
                 }
             }

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

@@ -68,7 +68,8 @@
         a1.riskStaffUserName,
         a1.reaRepaymentName AS repaymentName,
         a1.createTime,
-        a1.orgSidPath
+        a1.orgSidPath,
+        a1.lockCarState
         FROM
         (SELECT
         lrpd.sid,
@@ -96,13 +97,20 @@
         bv.riskStaffUserSid,
         bv.riskStaffUserName,
         bv.reaRepaymentName,
-        lr.createTime
+        lr.createTime,
+        CASE lbcv.lockCarState
+        WHEN 0 THEN '未控制'
+        WHEN 1 THEN '控制成功'
+        WHEN 2 THEN '控制失败'
+        WHEN 3 THEN '已解控' END AS lockCarState
         FROM
         `loan_repayment_plan_details` lrpd
         LEFT JOIN `loan_repayment_history` lrh
         ON lrh.planDetailSid = lrpd.`sid`
         LEFT JOIN anrui_buscenter.`bus_sales_order_vehicle` bv
         ON lrpd.busVinSid = bv.sid
+        LEFT JOIN loan_be_collection_veh lbcv
+        ON lrpd.busVinSid = lbcv.saleVehSid
         LEFT JOIN
         (SELECT
         saleVehSid,
@@ -110,7 +118,7 @@
         FROM
         loan_be_collection_record
         ORDER BY createTime DESC
-        LIMIT 100) lr
+        LIMIT 1) lr
         ON lrpd.busVinSid = lr.saleVehSid
         WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') < CURDATE()
         GROUP BY lrpd.`sid`
@@ -135,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,
@@ -185,12 +194,14 @@
                 )
                 ), 1) AS beOverdueMoneyAndPeriod,
                 a1.busVinSid AS saleVehSid,
-                a1.salesOrderSid
+                a1.salesOrderSid,
+                a1.lockCarState
         FROM
                 (SELECT
                 lrpd.sid,
                 lrpd.busVinSid,
                 lrpd.`loanContractNo`,
+                lrpd.`bankContractNo`,
                 lrpd.`vinNo`,
                 lrpd.`bankName`,
                 lrpd.borrowerName,
@@ -206,13 +217,20 @@
                 ct.mobile,
                 lr.createTime,
                 lrpd.borrowerSid,
-                lrpd.salesOrderSid
+                lrpd.salesOrderSid,
+                CASE lbcv.lockCarState
+                WHEN 0 THEN '未控制'
+                WHEN 1 THEN '控制成功'
+                WHEN 2 THEN '控制失败'
+                WHEN 3 THEN '已解控' END AS lockCarState
                 FROM
                 `loan_repayment_plan_details` lrpd
                 LEFT JOIN `loan_repayment_history` lrh
                 ON lrh.planDetailSid = lrpd.`sid`
                 LEFT JOIN anrui_buscenter.`bus_sales_order_vehicle` bv
                 ON lrpd.busVinSid = bv.sid
+                LEFT JOIN loan_be_collection_veh lbcv
+                ON lrpd.busVinSid = lbcv.saleVehSid
                 LEFT JOIN
                 (SELECT
                 saleVehSid,
@@ -220,7 +238,7 @@
                 FROM
                 loan_be_collection_record
                 ORDER BY createTime DESC
-                LIMIT 100) lr
+                LIMIT 1) lr
                 ON lrpd.busVinSid = lr.saleVehSid
                 LEFT JOIN anrui_crm.`crm_customer_temp` ct
                 ON lrpd.customerSid = ct.sid

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

@@ -102,6 +102,9 @@ public class LoanBeOverdueVehService {
         if (StringUtils.isNotBlank(query.getRiskStaffName())) {
             qw.like("a1.riskStaffUserName", query.getRiskStaffName());
         }
+        if (StringUtils.isNotBlank(query.getLockCarState())) {
+            qw.eq("a1.lockCarState", query.getLockCarState());
+        }
         if (StringUtils.isNotBlank(query.getVinNo())) {
             qw.like("a1.vinNo", query.getVinNo());
         }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java

@@ -95,6 +95,7 @@ import java.io.InputStream;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 /**
@@ -191,8 +192,8 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
         if (StringUtils.isNotBlank(query.getCreateByName())) {
             qw.like("createByName", query.getCreateByName());
         }
-        if (StringUtils.isNotBlank(query.getBillNo())) {
-            qw.like("billNo", query.getBillNo());
+        if (StringUtils.isNotBlank(query.getDeptName())) {
+            qw.like("deptName", query.getDeptName());
         }
         qw.apply(StringUtils.isNotBlank(query.getCreateStartTime()), "date_format (createTime,'%Y-%m-%d') >= date_format('" + query.getCreateStartTime() + "','%Y-%m-%d')").
                 apply(StringUtils.isNotBlank(query.getCreateEndTime()), "date_format (createTime,'%Y-%m-%d') <= date_format('" + query.getCreateEndTime() + "','%Y-%m-%d')"
@@ -553,14 +554,41 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
                     checkWord.add("期数不能为空");
                     break;
                 }
+                if (StringUtils.isNotBlank(excelInfo.getPeriod())){
+                    String period = excelInfo.getPeriod();
+                    Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*$");
+                    boolean matches = pattern.matcher(period).matches();
+                    if (!matches){
+                        checkWord.add("期数必须为数字");
+                        break;
+                    }
+                }
                 if (StringUtils.isBlank(excelInfo.getBePrincipal())) {
                     checkWord.add("逾期本金不能为空");
                     break;
                 }
+                if (StringUtils.isNotBlank(excelInfo.getBePrincipal())){
+                    String bePrincipal = excelInfo.getBePrincipal();
+                    Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*$");
+                    boolean matches = pattern.matcher(bePrincipal).matches();
+                    if (!matches){
+                        checkWord.add("逾期本金必须为数字");
+                        break;
+                    }
+                }
                 if (StringUtils.isBlank(excelInfo.getBeDefInter())) {
                     checkWord.add("逾期罚息不能为空");
                     break;
                 }
+                if (StringUtils.isNotBlank(excelInfo.getBeDefInter())){
+                    String beDefInter = excelInfo.getBeDefInter();
+                    Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*$");
+                    boolean matches = pattern.matcher(beDefInter).matches();
+                    if (!matches){
+                        checkWord.add("逾期罚息必须为数字");
+                        break;
+                    }
+                }
                 if (StringUtils.isBlank(excelInfo.getBankCollectionAcc())) {
                     checkWord.add("资方收款账户不能为空");
                     break;

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml

@@ -58,7 +58,8 @@
     </select>
 
     <select id="details" resultType="com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.MonRepayDetails">
-        SELECT lrpd.useOrgName,
+        SELECT
+                lrpd.useOrgName,
                 lrpd.dept,
                 lrpd.staffName,
                 RIGHT (lrpd.`vinNo`, 8) AS vinNo,
@@ -68,7 +69,7 @@
                 lrpd.customer,
                 lrpd.borrowerName,
                 (
-            lrpd.`dueMoney` - SUM (IFNULL(lrh.actualMoney, 0))
+                lrpd.`dueMoney` - SUM(IFNULL(lrh.actualMoney, 0))
                 ) AS notRepaidMoney
         FROM
                 `loan_repayment_plan_details` lrpd
@@ -87,9 +88,7 @@
                 ON lrpd.busVinSid = lr.saleVehSid
                 LEFT JOIN anrui_crm.`crm_customer_temp` ct
                 ON lrpd.customerSid = ct.sid
-        WHERE DATE_FORMAT(lrpd.dueDate
-            , '%Y-%m-%d')
-         &lt; CURDATE()
+        WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') &lt; CURDATE()
           AND lrpd.busVinSid = #{saleVehSid}
         GROUP BY lrpd.`sid`
         HAVING (notRepaidMoney > 0)

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyMapper.xml

@@ -139,7 +139,7 @@
                 FROM
                 loan_be_collection_record
                 ORDER BY createTime DESC
-                LIMIT 100) lr
+                LIMIT 1) lr
                 ON lrpd.busVinSid = lr.saleVehSid
                 LEFT JOIN anrui_crm.`crm_customer_temp` ct
                 ON lrpd.customerSid = ct.sid

doc/databases/reportcenter.sql

@@ -0,0 +1,26 @@
+DROP TABLE IF EXISTS `report_set`;
+CREATE TABLE `report_set`
+(
+    `id`          int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `sid`         varchar(64) NOT NULL COMMENT 'sid',
+    `lockVersion` int(32)              DEFAULT '0' COMMENT '版本锁',
+    `createTime`  timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `modifyTime`  timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+    `isEnable`    int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`       int(32)              DEFAULT '1' COMMENT '状态',
+    `isDelete`    int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `remarks`     varchar(255)         DEFAULT NULL COMMENT '备注',
+    `createBySid` varchar(64)          DEFAULT NULL COMMENT '创建人sid',
+    `updateBySid` varchar(64)          DEFAULT NULL COMMENT '修改人sid',
+    `stock`       int(32)              DEFAULT NULL COMMENT '库存',
+    `pcOrder`     int(32)              DEFAULT NULL COMMENT '排产',
+    `reserveCar`  int(32)              DEFAULT NULL COMMENT '订车',
+    `sales`       int(32)              DEFAULT NULL COMMENT '销售',
+    `deliver`     int(32)              DEFAULT NULL COMMENT '交付',
+    `buyout`      int(32)              DEFAULT NULL COMMENT '买断',
+    `outbound`    int(32)              DEFAULT NULL COMMENT '欠款出库',
+    `loanDis`     int(32)              DEFAULT NULL COMMENT '金融未放款',
+    PRIMARY KEY (`id`),
+    KEY `id` (`id`)
+) ENGINE = INNODB
+  DEFAULT CHARSET = utf8 COMMENT ='统计报表设计折叠';