From 8f500791211eb5f85cde119b5fccf197dcb73bb6 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Fri, 2 Jun 2023 16:37:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=B4=A6=E5=8D=95=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E5=88=86=E9=A1=B5=E6=A0=B9=E6=8D=AE=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...inUncollectedReceivablesDetailedMapper.xml | 20 +++++++++++--------
 ...UncollectedReceivablesDetailedService.java |  7 +++----
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml
index 24bce02906..1e5610eb15 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml
@@ -10,8 +10,10 @@
         SELECT
         *
         from fin_uncollected_receivables_detailed
+
         <where>
             ${ew.sqlSegment}
+            ORDER BY createTime DESC ,id
         </where>
     </select>
 
@@ -142,21 +144,23 @@
     <select id="selectByContractNoOne" resultType="java.lang.String">
         select fun.busVinSid
         from fin_uncollected_receivables_detailed fun
-        left join fin_uncollected_receivables_detailed fun1 on fun.busVinSid = fun1.busVinSid
+                 left join fin_uncollected_receivables_detailed fun1 on fun.busVinSid = fun1.busVinSid
         where fun.contractNo = #{contractNo}
-        and (fun.currentReceivableMoney &lt; 0 or fun.currentReceivableMoney = 0 )
-        and fun.receivablesName='订金' and (fun1.currentReceivableMoney &lt; 0 or fun1.currentReceivableMoney = 0 )
-        and (fun1.receivablesName='首付款及费用' or fun1.receivablesName = '车款')
+          and (fun.currentReceivableMoney &lt; 0 or fun.currentReceivableMoney = 0)
+          and fun.receivablesName = '订金'
+          and (fun1.currentReceivableMoney &lt; 0 or fun1.currentReceivableMoney = 0)
+          and (fun1.receivablesName = '首付款及费用' or fun1.receivablesName = '车款')
     </select>
 
     <select id="selectByCreateBySidOne" resultType="java.lang.String">
         select fun.busVinSid
         from fin_uncollected_receivables_detailed fun
-        left join fin_uncollected_receivables_detailed fun1 on fun.busVinSid = fun1.busVinSid
+                 left join fin_uncollected_receivables_detailed fun1 on fun.busVinSid = fun1.busVinSid
         where fun.createBySid = #{userSid}
-        and (fun.currentReceivableMoney &lt; 0 or fun.currentReceivableMoney = 0 )
-        and fun.receivablesName='订金' and (fun1.currentReceivableMoney &lt; 0 or fun1.currentReceivableMoney = 0 )
-        and (fun1.receivablesName='首付款及费用' or fun1.receivablesName = '车款')
+          and (fun.currentReceivableMoney &lt; 0 or fun.currentReceivableMoney = 0)
+          and fun.receivablesName = '订金'
+          and (fun1.currentReceivableMoney &lt; 0 or fun1.currentReceivableMoney = 0)
+          and (fun1.receivablesName = '首付款及费用' or fun1.receivablesName = '车款')
     </select>
     <select id="selectSidBybusVinSidAndConNo" resultType="java.lang.String">
 
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java
index af24f3a05b..85f256d19b 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java
@@ -349,7 +349,6 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
                 );
         qw.eq("useOrgSid", query.getUseOrgSid());
         qw.eq("isDelete", "0");
-        qw.orderByDesc("createTime");
         return qw;
     }
 
@@ -806,11 +805,11 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
         if (finVehicleInvoice != null) {
             InvoiceVo invoiceVo = new InvoiceVo();
             BeanUtils.copyProperties(finVehicleInvoice, invoiceVo);
-            if(finVehicleInvoice.getInvoiceAmount() != null){
+            if (finVehicleInvoice.getInvoiceAmount() != null) {
                 invoiceVo.setInvoiceAmount(finVehicleInvoice.getInvoiceAmount().toString());
             }
-            if(finVehicleInvoice.getInvoiceDate() != null){
-                invoiceVo.setInvoiceDate(DateUtil.format(finVehicleInvoice.getInvoiceDate(),"yyyy-MM-dd"));
+            if (finVehicleInvoice.getInvoiceDate() != null) {
+                invoiceVo.setInvoiceDate(DateUtil.format(finVehicleInvoice.getInvoiceDate(), "yyyy-MM-dd"));
             }
             receiveInvoiceVo.setInvoiceVo(invoiceVo);
         }