dev
parent
42e57adaf9
commit
18c3d12db6
|
|
@ -42,7 +42,7 @@ public class InvoiceUseService {
|
||||||
Integer order_state
|
Integer order_state
|
||||||
) {
|
) {
|
||||||
String logsql = "select \n" +
|
String logsql = "select \n" +
|
||||||
" t.id rowkey, t.invoice_number, t.`code` invoice_code, t.state invoice_state, t.settlement_user_name, t.settlement_time, t.create_time, t.invalid_time, t.invalid_memo, t.invoice_type, t.invalid_user_name\n" +
|
" t.id rowkey, t.invoice_number, t.`code` invoice_code, t.state invoice_state, t.settlement_user_name, t.settlement_time, t.settlement_time create_time, t.invalid_time, t.invalid_memo, t.invoice_type, t.invalid_user_name\n" +
|
||||||
" , r.receive_user_name, r.create_time receive_time, r.supermarket_id\n" +
|
" , r.receive_user_name, r.create_time receive_time, r.supermarket_id\n" +
|
||||||
" , o.sn order_sn, o.weight, o.total_price, o.unit_price, o.truck_license, o.customer_id, o.customer_texpayer_name, o.customer_texpayer_num, o.isprepaid, o.state order_state\n" +
|
" , o.sn order_sn, o.weight, o.total_price, o.unit_price, o.truck_license, o.customer_id, o.customer_texpayer_name, o.customer_texpayer_num, o.isprepaid, o.state order_state\n" +
|
||||||
" , s.name supermarket_name " +
|
" , s.name supermarket_name " +
|
||||||
|
|
@ -66,7 +66,7 @@ public class InvoiceUseService {
|
||||||
List<Object> paramlog = new ArrayList<>();
|
List<Object> paramlog = new ArrayList<>();
|
||||||
List<Object> paramord = new ArrayList<>();
|
List<Object> paramord = new ArrayList<>();
|
||||||
|
|
||||||
logsql += " and t.create_time >= ? and t.create_time < date_add(?, interval 1 day)\n";
|
logsql += " and t.settlement_time >= ? and t.settlement_time < date_add(?, interval 1 day)\n";
|
||||||
ordsql += " and t.create_time >= ? and t.create_time < date_add(?, interval 1 day)\n";
|
ordsql += " and t.create_time >= ? and t.create_time < date_add(?, interval 1 day)\n";
|
||||||
|
|
||||||
paramlog.add(tm);
|
paramlog.add(tm);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue