From 68a4bb317532562660047660f99fe048c793e4cd Mon Sep 17 00:00:00 2001 From: "lisai17@sina.com" Date: Tue, 3 Nov 2020 09:23:02 +0800 Subject: [PATCH] . --- .../order/ordercluster/truck/OrderclusterTruckService.java | 2 +- .../java/com/cowr/ssjygl/stat/invoice/InvoiceUseService.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/truck/OrderclusterTruckService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/truck/OrderclusterTruckService.java index 5af8c15..d099a50 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/truck/OrderclusterTruckService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/truck/OrderclusterTruckService.java @@ -82,7 +82,7 @@ public class OrderclusterTruckService extends BaseService { findSql += " " + Const.ORDER_BY_DESC; } } else { - findSql += " order by c.cutoff_time desc"; + findSql += " order by c.cutoff_time desc, t.id"; } return Db.paginateByFullSql(pp.getPage(), pp.getSize(), totalRowSql, findSql, paraList.toArray()); diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/invoice/InvoiceUseService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/invoice/InvoiceUseService.java index 00baa61..77ef4d3 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/invoice/InvoiceUseService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/invoice/InvoiceUseService.java @@ -130,8 +130,6 @@ public class InvoiceUseService { if (invoice_type != null && invoice_type == 1) { list = Db.find(logsql + " order by t.create_time", paramlog.toArray()); } else { - paramlog.addAll(paramord); - if (invoice_type != null && invoice_type == 2) { logsql += " and t.invoice_type = ? \n"; ordsql += " and t.invoice_type = ? \n"; @@ -140,6 +138,8 @@ public class InvoiceUseService { paramord.add(invoice_type); } + paramlog.addAll(paramord); + list = Db.find("select * from (" + logsql + "\n union \n " + ordsql + ") a order by a.create_time ", paramlog.toArray()); }