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-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/loanbeoverdueveh/LoanBeOverdueVehMapper.xml

@@ -110,7 +110,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`
@@ -220,7 +220,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,43 +58,42 @@
     </select>
 
     <select id="details" resultType="com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.MonRepayDetails">
-        SELECT lrpd.useOrgName,
-               lrpd.dept,
-               lrpd.staffName,
-            RIGHT (lrpd.`vinNo`, 8) AS vinNo,
-            lrpd.`loanContractNo`,
-            lrpd.`bankName`,
-            lrpd.bankContractNo,
-            lrpd.customer,
-            lrpd.borrowerName,
-            (
-            lrpd.`dueMoney` - SUM (IFNULL(lrh.actualMoney, 0))
-            ) AS notRepaidMoney
+        SELECT
+                lrpd.useOrgName,
+                lrpd.dept,
+                lrpd.staffName,
+                RIGHT (lrpd.`vinNo`, 8) AS vinNo,
+                lrpd.`loanContractNo`,
+                lrpd.`bankName`,
+                lrpd.bankContractNo,
+                lrpd.customer,
+                lrpd.borrowerName,
+                (
+                lrpd.`dueMoney` - SUM(IFNULL(lrh.actualMoney, 0))
+                ) AS notRepaidMoney
         FROM
-            `loan_repayment_plan_details` lrpd
-            LEFT JOIN `loan_repayment_history` lrh
+                `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
-            (SELECT
-            saleVehSid,
-            createTime
-            FROM
-            loan_be_collection_record
-            ORDER BY createTime DESC
-            LIMIT 1) lr
-            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()
+                LEFT JOIN anrui_buscenter.`bus_sales_order_vehicle` bv
+                ON lrpd.busVinSid = bv.sid
+                LEFT JOIN
+                (SELECT
+                saleVehSid,
+                createTime
+                FROM
+                loan_be_collection_record
+                ORDER BY createTime DESC
+                LIMIT 1) lr
+                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()
           AND lrpd.busVinSid = #{saleVehSid}
         GROUP BY lrpd.`sid`
         HAVING (notRepaidMoney > 0)
         ORDER BY lrpd.period
-            LIMIT 1
+                LIMIT 1
     </select>
 
     <select id="periodDetails" resultType="com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.MonRepayPeriodDetails">

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