xjm
/
ssjygl-xsct-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

.

dev
lisai17@sina.com 2020-11-03 09:23:02 +08:00
parent a9bb7003a2
commit 68a4bb3175
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/truck/OrderclusterTruckService.java
View File

@ -82,7 +82,7 @@ public class OrderclusterTruckService extends BaseService {
findSql += " " + Const.ORDER_BY_DESC; findSql += " " + Const.ORDER_BY_DESC;
} }
} else { } 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()); return Db.paginateByFullSql(pp.getPage(), pp.getSize(), totalRowSql, findSql, paraList.toArray());

4
ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/invoice/InvoiceUseService.java
View File

@ -130,8 +130,6 @@ public class InvoiceUseService {
if (invoice_type != null && invoice_type == 1) { if (invoice_type != null && invoice_type == 1) {
list = Db.find(logsql + " order by t.create_time", paramlog.toArray()); list = Db.find(logsql + " order by t.create_time", paramlog.toArray());
} else { } else {
paramlog.addAll(paramord);
if (invoice_type != null && invoice_type == 2) { if (invoice_type != null && invoice_type == 2) {
logsql += " and t.invoice_type = ? \n"; logsql += " and t.invoice_type = ? \n";
ordsql += " and t.invoice_type = ? \n"; ordsql += " and t.invoice_type = ? \n";
@ -140,6 +138,8 @@ public class InvoiceUseService {
paramord.add(invoice_type); 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()); list = Db.find("select * from (" + logsql + "\n union \n " + ordsql + ") a order by a.create_time ", paramlog.toArray());
} }