饼图

src/task/task.service.ts

@@ -63,7 +63,8 @@ export class TaskService implements OnModuleInit {
         private readonly sysConfigService: SysConfigService,
         private readonly balanceService: BalanceService,
         private readonly userService: UsersService
-    ) {}
+    ) {
+    }
 
     onModuleInit() {
         this.lock.acquire('dispatchTask', async () => {
@@ -607,7 +608,8 @@ export class TaskService implements OnModuleInit {
                     if (durianRes.data.code === 200) {
                         res.durian = durianRes.data.data.score
                     }
-                } catch (e) {}
+                } catch (e) {
+                }
             })(),
             (async () => {
                 try {
@@ -620,7 +622,8 @@ export class TaskService implements OnModuleInit {
                     if (cloud033Res.data.code === '1001') {
                         res.cloud033 = cloud033Res.data.data.integral
                     }
-                } catch (e) {}
+                } catch (e) {
+                }
             })(),
             (async () => {
                 try {
@@ -633,7 +636,8 @@ export class TaskService implements OnModuleInit {
                     if (cloud034Res.data.code === '1001') {
                         res.cloud034 = cloud034Res.data.data.integral
                     }
-                } catch (e) {}
+                } catch (e) {
+                }
             })()
         ])
         return res
@@ -665,6 +669,10 @@ export class TaskService implements OnModuleInit {
             }
         }
 
+        // 昨天
+        const yesterday = new Date()
+        yesterday.setDate(yesterday.getDate() - 1)
+        yesterday.setHours(0, 0, 0, 0)
         const res = await this.taskRepository
             .createQueryBuilder()
             .select([
@@ -674,11 +682,17 @@ export class TaskService implements OnModuleInit {
             .where(where)
             .andWhere('country is not null')
             .andWhere('status = :status', { status: TaskStatus.COMPLETED })
+            .andWhere('createdAt between :start and :end', {
+                start: startOfDay(yesterday),
+                end: endOfDay(yesterday)
+            })
             .groupBy('country')
             .orderBy('value', 'DESC')
             .getRawMany()
 
-
+        const sixDaysAgo = new Date()
+        sixDaysAgo.setDate(sixDaysAgo.getDate() - 7)
+        sixDaysAgo.setHours(0, 0, 0, 0)
         const totalRes = await this.taskRepository
             .createQueryBuilder()
             .select([
@@ -687,6 +701,10 @@ export class TaskService implements OnModuleInit {
             ])
             .where(where)
             .andWhere('country is not null')
+            .andWhere('createdAt between :start and :end', {
+                start: sixDaysAgo,
+                end: new Date()
+            })
             .groupBy('country')
             .orderBy('value', 'DESC')
             .getRawMany()
@@ -1037,9 +1055,9 @@ export class TaskService implements OnModuleInit {
             const counts = (
                 await this.taskItemRepository.manager.query(
                     `select status, count(*) as count
-                 from task_item
-                 where taskId = ${task.id} and embed = 0
-                 group by status`
+                     from task_item
+                     where taskId = ${task.id} and embed = 0
+                     group by status`
                 )
             ).reduce((acc, item) => {
                 acc[item.status] = parseInt(item.count)