From ec34b10022200776fe3634d820caf7d3b7abcd5b Mon Sep 17 00:00:00 2001 From: "lisai17@sina.com" Date: Wed, 28 Jul 2021 17:02:46 +0800 Subject: [PATCH] . --- .../java/com/cowr/ssjygl/stat/sale/OrderStatService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java index aa8e4c0..0985694 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java @@ -1977,6 +1977,7 @@ public class OrderStatService { " tp.id customer_type_id,\n" + " tp.name customer_type_name,\n" + " c.name customer_name,\n" + + " c.name,\n" + " a.total_amount prepay_total_amount,\n" + " p.surplus prepay_surplus\n" + " from (\n" + @@ -1989,7 +1990,7 @@ public class OrderStatService { " left join customer_type tp on tp.id = c.customer_type_id\n" + " left join prepay_customer p on p.customer_id = c.id\n" + " union\n" + - " select 0 customer_id, 99 customer_type_id, '零散' customer_type_name, '零散客户' customer_name, null prepay_total_amount, null prepay_surplus", tm); + " select 0 customer_id, 99 customer_type_id, '零散' customer_type_name, '零散客户' customer_name, '零散客户' name, null prepay_total_amount, null prepay_surplus", tm); customer_pre_list.sort(new Comparator() { @Override @@ -2070,7 +2071,7 @@ public class OrderStatService { typemap.get(customer_type_id).add(record); } - List typelist = Db.find("select id customer_type_id, name customer_type_name from customer_type"); + List typelist = Db.find("select id customer_type_id, name customer_type_name, name from customer_type"); for (Record record : typelist) { Integer customer_type_id = record.getInt("customer_type_id");