diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/overall/OverallService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/overall/OverallService.java index 51de864..8b9e308 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/overall/OverallService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/overall/OverallService.java @@ -163,9 +163,9 @@ group by date " ifnull(sum(t.weight), 0) total_weight,\n" + " ifnull(sum(t.total_price), 0) total_price,\n" + " ifnull(count(t.sn), 0) truck_cnt,\n" + - " ifnull(sum(case when t.create_time >= ? then t.weight end ), 0) year_total_weight,\n" + - " ifnull(sum(case when t.create_time >= ? then t.total_price end ), 0) year_total_price,\n" + - " ifnull(sum(case when t.create_time >= ? then 1 else 0 end ), 0) year_truck_cnt,\n" + + " ifnull(sum(case when t.create_time >= ? and t.sale_type = 0 then t.weight end ), 0) year_total_weight,\n" + + " ifnull(sum(case when t.create_time >= ? and t.sale_type = 0 then t.total_price end ), 0) year_total_price,\n" + + " ifnull(sum(case when t.create_time >= ? and t.sale_type = 0 then 1 else 0 end ), 0) year_truck_cnt,\n" + " ifnull(sum(case when t.create_time >= ? then t.weight end ), 0) month_total_weight,\n" + " ifnull(sum(case when t.create_time >= ? then t.total_price end ), 0) month_total_price,\n" + " ifnull(sum(case when t.create_time >= ? then 1 else 0 end ), 0) month_truck_cnt,\n" +