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

.

dev
lisai17@sina.com 2021-07-28 17:02:46 +08:00
parent 131f160184
commit ec34b10022
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java
View File

@ -1977,6 +1977,7 @@ public class OrderStatService {
" tp.id customer_type_id,\n" + " tp.id customer_type_id,\n" +
" tp.name customer_type_name,\n" + " tp.name customer_type_name,\n" +
" c.name customer_name,\n" + " c.name customer_name,\n" +
" c.name,\n" +
" a.total_amount prepay_total_amount,\n" + " a.total_amount prepay_total_amount,\n" +
" p.surplus prepay_surplus\n" + " p.surplus prepay_surplus\n" +
" from (\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 customer_type tp on tp.id = c.customer_type_id\n" +
" left join prepay_customer p on p.customer_id = c.id\n" + " left join prepay_customer p on p.customer_id = c.id\n" +
" union\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<Record>() { customer_pre_list.sort(new Comparator<Record>() {
@Override @Override
@ -2070,7 +2071,7 @@ public class OrderStatService {
typemap.get(customer_type_id).add(record); typemap.get(customer_type_id).add(record);
} }
List<Record> typelist = Db.find("select id customer_type_id, name customer_type_name from customer_type"); List<Record> typelist = Db.find("select id customer_type_id, name customer_type_name, name from customer_type");
for (Record record : typelist) { for (Record record : typelist) {
Integer customer_type_id = record.getInt("customer_type_id"); Integer customer_type_id = record.getInt("customer_type_id");