wuyi hai 1 ano
pai
achega
6eef0bfb63
Modificáronse 1 ficheiros con 6 adicións e 4 borrados
  1. 6 4
      src/task/task.service.ts

+ 6 - 4
src/task/task.service.ts

@@ -399,6 +399,7 @@ export class TaskService implements OnModuleInit {
 
 
     async homeStatistics(req: any) {
     async homeStatistics(req: any) {
         let where = {}
         let where = {}
+        let codeSum = '0'
         const res = {
         const res = {
             xData: [],
             xData: [],
             sentData: [],
             sentData: [],
@@ -426,16 +427,17 @@ export class TaskService implements OnModuleInit {
                 userId: Not(1),
                 userId: Not(1),
                 createdAt: Between(sixDaysAgo, new Date())
                 createdAt: Between(sixDaysAgo, new Date())
             }
             }
+        }
 
 
-            await this.rcsNumberRepository
+        if (req.user.roles.includes('admin') || req.user.roles.includes('superApi')) {
+            codeSum = await this.rcsNumberRepository
                 .createQueryBuilder()
                 .createQueryBuilder()
                 .select('count(1) as sum')
                 .select('count(1) as sum')
                 .where('rcsNumber.status = :status', { status: 'success' })
                 .where('rcsNumber.status = :status', { status: 'success' })
                 .andWhere('DATE(rcsNumber.createdAt) = CURDATE()')
                 .andWhere('DATE(rcsNumber.createdAt) = CURDATE()')
                 .getRawOne().then((data) => {
                 .getRawOne().then((data) => {
-                    res.todayData.push(data.sum)
+                    return data.sum
                 })
                 })
-
         }
         }
 
 
         return await this.taskRepository
         return await this.taskRepository
@@ -458,7 +460,7 @@ export class TaskService implements OnModuleInit {
                         res.successData.push(item.success)
                         res.successData.push(item.success)
                         res.totalData.push(item.total)
                         res.totalData.push(item.total)
                         if (moment(new Date()).format('MM-DD').includes(day)) {
                         if (moment(new Date()).format('MM-DD').includes(day)) {
-                            res.todayData.push(item.sent, item.success, item.total)
+                            res.todayData.push(item.sent, item.success, item.total, codeSum)
                         }
                         }
                     })
                     })
                 }
                 }