zs 1 年之前
父節點
當前提交
652d832055
共有 1 個文件被更改,包括 8 次插入8 次删除
  1. 8 8
      src/service/Statistics.service.ts

+ 8 - 8
src/service/Statistics.service.ts

@@ -36,22 +36,22 @@ export class StatisticsService {
 
   // 每个月下单数量
   async orderDetail(filter): Promise<Array<any>> {
-    const { supplier, time } = filter;
+    const { supplier, time, c_accounting, c_leader } = filter;
     const result = [];
+    const search: any = { status: '10' };
+    if (supplier) search.supplier = supplier;
+    if (c_leader) search.c_leader = { $elemMatch: { _id: c_leader } };
+    else if (c_accounting)
+      search.c_accounting = { $elemMatch: { _id: c_accounting } };
     for (let i = 1; i < 13; i++) {
       let buy_time;
       if (i < 10) buy_time = `${time}-0${i}`;
       else buy_time = `${time}-${i}`;
+      search.buy_time = { $regex: buy_time };
       const info: any = { year: '', money: 0 };
       info.year = i + '月';
       info.money = 0;
-      const res = await this.orderDetailModel
-        .find({
-          supplier: supplier,
-          buy_time: { $regex: buy_time },
-          status: '10',
-        })
-        .lean();
+      const res = await this.orderDetailModel.find(search).lean();
       for (const val of res) {
         info.money = info.money + val.total_money;
       }