Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicle/BusSalesVehicleMapper.xml

@@ -2,18 +2,18 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.buscenter.biz.bussalesvehicle.BusSalesVehicleMapper">
     <select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.bussalesvehicle.BusSalesVehicleVo">
-        select bv.useOrgName,
-               bvoa.orgName                               deptName,
-               bvoa.staffName,
-               bvoa.customerName,
-               bvoa.contractNo,
-               bv.modelName,
-               bv.vinNo,
-               bvoa.saleTypeValue                         saleType,
-               DATE_FORMAT(bvoa.saleDate, '%Y-%m-%d')  as saleDate,
-               if(length(bh.closingDate) > 0, '已交付', '未交付')
-                                                       as handoverState,
-               DATE_FORMAT(bh.closingDate, '%Y-%m-%d') as handoverDate
+        select distinct bv.vinNo,
+                        bv.useOrgName,
+                        bvoa.orgName                               deptName,
+                        bvoa.staffName,
+                        bvoa.customerName,
+                        bvoa.contractNo,
+                        bv.modelName,
+                        bvoa.saleTypeValue                         saleType,
+                        DATE_FORMAT(bvoa.saleDate, '%Y-%m-%d')  as saleDate,
+                        if(length(bh.closingDate) > 0, '已交付', '未交付')
+                                                                as handoverState,
+                        DATE_FORMAT(bh.closingDate, '%Y-%m-%d') as handoverDate
         from anrui_base.base_vehicle_out bvo
                  left join anrui_base.base_vehicle_out_apply bvoa on bvoa.sid = bvo.mainSid
                  left join anrui_base.base_vehicle bv on bvo.vinSid = bv.sid
@@ -81,11 +81,11 @@
             <if test="state != null and state != ''">
                 <if test='state == "1"'>
                     and length(bh.closingDate)
-                    >0
+                      >0
                 </if>
                 <if test='state == "0"'>
                     and (bh.closingDate is null
-                    or length(bh.closingDate) =0)
+                     or length(bh.closingDate) =0)
                 </if>
             </if>
         </where>

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

@@ -23,7 +23,7 @@
                 <span style="padding: 0 8px">至</span>
                 <el-date-picker v-model="listQuery.params.applyEndDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
               </el-form-item>
-              <el-form-item label="申请日期">
+              <el-form-item label="办结日期">
                 <el-date-picker v-model="listQuery.params.closingStartDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
                 <span style="padding: 0 8px">至</span>
                 <el-date-picker v-model="listQuery.params.closingEndDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java

@@ -1199,6 +1199,9 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
         if (StringUtils.isNotBlank(pagerQuery.getStaffName())) {
             qw.like("p.staffName", pagerQuery.getStaffName());
         }
+        if (StringUtils.isNotBlank(pagerQuery.getBuckleKey())) {
+            qw.like("h.buckleKey", pagerQuery.getBuckleKey());
+        }
         if (StringUtils.isNotBlank(pagerQuery.getLoanContractNo())) {
             qw.like("p.loanContractNo", pagerQuery.getLoanContractNo());
         }