dev
parent
f63963ecd9
commit
ef99e07e96
|
|
@ -226,6 +226,7 @@ public class PrepayService {
|
||||||
" ,a.paid \n" +
|
" ,a.paid \n" +
|
||||||
" ,a.customer_id \n" +
|
" ,a.customer_id \n" +
|
||||||
" ,a.customer_name \n" +
|
" ,a.customer_name \n" +
|
||||||
|
" ,a.create_time \n" +
|
||||||
" from ( \n" + sale_sql +
|
" from ( \n" + sale_sql +
|
||||||
" union \n" + temp_sql +
|
" union \n" + temp_sql +
|
||||||
" ) a \n" +
|
" ) a \n" +
|
||||||
|
|
@ -432,7 +433,7 @@ public class PrepayService {
|
||||||
*/
|
*/
|
||||||
public List<Record> flow(Integer customer_id, String stm, String etm) {
|
public List<Record> flow(Integer customer_id, String stm, String etm) {
|
||||||
String sql = "select * from ( \n" +
|
String sql = "select * from ( \n" +
|
||||||
" select a.sn id, a.create_time, p.arrive_time tm, 0 - a.total_price amount, '扣费' type, \n" +
|
" select a.sn id, p.arrive_time tm, 0 - a.total_price amount, '扣费' type, \n" +
|
||||||
" case when a.paid > 0 then concat('补差额', a.paid) else '' end memo, a.customer_id, a.customer_name \n" +
|
" case when a.paid > 0 then concat('补差额', a.paid) else '' end memo, a.customer_id, a.customer_name \n" +
|
||||||
" from ( \n" +
|
" from ( \n" +
|
||||||
" select t.sn, t.total_price, t.paid, t.customer_id, t.customer_name, t.create_time \n" +
|
" select t.sn, t.total_price, t.paid, t.customer_id, t.customer_name, t.create_time \n" +
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue