客户账单明细分页根据时间排序问题

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>
 
@@ -144,9 +146,10 @@
         from fin_uncollected_receivables_detailed fun
                  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">
@@ -154,9 +157,10 @@
         from fin_uncollected_receivables_detailed fun
                  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">
 

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);
         }