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 742f2ce..3eaa276 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 @@ -422,6 +422,30 @@ group by date } } + /* + [ + { + "day_quota_cnt": 1, // 今日有配额的客户数量 + "day_weight": 0.20, // 今日完成重量 + "name": "固定客户", + "cnt": 25, // 固定客户总数 + "day_total_price": 18.00, // 今日完成的销售额 + "id": 1, // id == 1 是固定客户 + "day_quota_weight": 100.00, // 今日配额重量 + "day_cnt": 1 // 今日运输车次 + }, + { + "day_quota_cnt": 2, // 今日有配额的客户数量 + "day_weight": 0.10, // 今日完成重量 + "name": "零散客户", + "cnt": 51, // 零散客户总数 + "day_total_price": 9.00, // 今日完成的销售额 + "id": 2, // id == 2 零散客户 + "day_quota_weight": 26.00, // 今日配额重量 + "day_cnt": 1 // 今日运输车次 + } + ] + */ public List customerQuota() { Date now = new Date(); String nowdaytm = DateTimeUtil.sdf.get().format(now); // 当日 @@ -471,4 +495,33 @@ group by date return outlist; } + + public List customerQuotaStat(){ + Date now = new Date(); + String nowdaytm = DateTimeUtil.sdf.get().format(now); // 当日 + + return Db.find("select\n" + + " t.* \n" + + " , s.lgtd origin_lgtd, s.lttd origin_lttd\n" + + " , ifnull(c.lgtd, " + Const.DEFAULT_LGTD + ") dest_lgtd, ifnull(c.lttd, " + Const.DEFAULT_LTTD + ") dest_lttd\n" + + " , ifnull(o.total_weight, 0) over_weight\n" + + " , ifnull(o.total_price, 0) over_total_price\n" + + " from ordercluster t\n" + + " left join supermarket s on s.id = t.supermarket_id\n" + + " left join (\n" + + " select t.* from customer_receiver t\n" + + " left join (\n" + + " select t.customer_id, min(t.id) id from customer_receiver t group by t.customer_id\n" + + " ) a on a.id = t.id\n" + + " where a.id is not null\n" + + " ) c on c.customer_id = t.customer_id\n" + + " left join (\n" + + " select t.ordercluster_id, sum(t.weight) total_weight, sum(t.total_price) total_price from order_temp t\n" + + " where t.state = 5\n" + + " and t.create_time like ?\n" + + " group by t.ordercluster_id\n" + + " ) o on o.ordercluster_id = t.id\n" + + " where t.state < 5\n" + + " and t.cutoff_time like ? ", nowdaytm + "%", nowdaytm + "%"); + } } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/overall/OverallController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/overall/OverallController.java index a600c19..8e840ff 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/overall/OverallController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/overall/OverallController.java @@ -39,4 +39,7 @@ public class OverallController extends Controller { public void customerQuota() { renderJson(Result.success(OverallService.me.customerQuota())); } + public void customerQuotaStat() { + renderJson(Result.success(OverallService.me.customerQuotaStat())); + } } \ No newline at end of file