From 2dcdf9bb3c0cd620551782ae2cfadf06eebc6eb2 Mon Sep 17 00:00:00 2001
From: river <1376754470@qq.com>
Date: Tue, 30 Mar 2021 15:42:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=A8=A1=E6=9D=BF=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E6=B3=A8=E9=87=8A=E4=BF=AE=E6=94=B9=E5=92=8C=E5=82=AC?=
 =?UTF-8?q?=E6=94=B6=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA=E6=8C=89=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/guarantee/AlCollectionMapper.xml  | 2 ++
 .../daqing/framework/domain/crms/ext/CompanyTemplate.java   | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/AlCollectionMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/AlCollectionMapper.xml
index 7a894302..a9a58a4a 100644
--- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/AlCollectionMapper.xml
+++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/AlCollectionMapper.xml
@@ -27,6 +27,7 @@
             AND (i.customer_name like CONCAT('%',#{codeOrName},'%') OR i.business_code like CONCAT('%',#{codeOrName},'%'))
         </if>
         GROUP BY i.id
+        ORDER BY i.create_time DESC
     </select>
 
     <!-- 催收 -->
@@ -60,6 +61,7 @@
         <if test="acr.startTime != null and acr.endTime != null">
             AND collection_time BETWEEN #{acr.startTime} AND #{acr.endTime}
         </if>
+        ORDER BY c.collection_time DESC
     </select>
 
     <select id="moreOverdueDetail" parameterType="integer" resultType="com.daqing.financial.guarantee.model.response.MoreOverdueDetailResponse">
diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CompanyTemplate.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CompanyTemplate.java
index a6f82569..29ac3196 100644
--- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CompanyTemplate.java
+++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CompanyTemplate.java
@@ -38,10 +38,10 @@ public class CompanyTemplate extends BaseRowModel implements Serializable {
     @ExcelProperty(value = "注册时间(eg:2020-02-20)", index = 3)
     private Date registerTime;
 
-    @ExcelProperty(value = "注册资金", index = 4)
+    @ExcelProperty(value = "注册资金(万元)", index = 4)
     private String registeredCapital;
 
-    @ExcelProperty(value = "员工人数", index = 5)
+    @ExcelProperty(value = "员工人数(人)", index = 5)
     private String empNum;
 
     @ExcelProperty(value = "注册地址", index = 6)
@@ -67,7 +67,7 @@ public class CompanyTemplate extends BaseRowModel implements Serializable {
     @ExcelProperty(value = "法人-姓名", index = 12)
     private String legalName;
 
-    @ExcelProperty(value = "法人-性别 1、男，0、女", index = 13)
+    @ExcelProperty(value = "法人-性别 1:男，0:女", index = 13)
     private Integer legalGender;
 
     @ExcelProperty(value = "法人-身份证号", index = 14)