From 78b8409ba371220773f8825c319eaec4ef7bf0b3 Mon Sep 17 00:00:00 2001
From: wuhan <18852676227@163.com>
Date: Fri, 8 Mar 2024 17:59:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=B8=E5=85=B3=E8=81=9A?=
 =?UTF-8?q?=E5=90=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/client/client.mapper.ts  | 38 +++++-------------------------------
 src/client/client.service.ts |  4 ----
 2 files changed, 5 insertions(+), 37 deletions(-)

diff --git a/src/client/client.mapper.ts b/src/client/client.mapper.ts
index 7413dc8..396ebb9 100644
--- a/src/client/client.mapper.ts
+++ b/src/client/client.mapper.ts
@@ -134,7 +134,9 @@ class ClientMapper {
       .addSelect('name', 'name')
       .addSelect('icon', 'icon')
       .addSelect('sum(num)', 'sum')
-      .groupBy('id')
+      .groupBy('name')
+      .addGroupBy('icon')
+      .addGroupBy('id')
       .orderBy('sum')
       .take(topLimit)
       .getRawMany();
@@ -142,52 +144,22 @@ class ClientMapper {
 
   async queryMpInfo({ id, startTime }) {
     const obj: any = {};
-    // if (id) {
     obj.id = id;
-    // return await MpInfo.find({
-    //   where: obj,
-    //   take: topLimit,
-    // });
-    // 计算最近7天的起始时间
-    // const toData = new Date(new Date().toLocaleDateString()).getTime();
-    // startTime = moment(startTime).format(
-    //   'YYYY-MM-DD 00:00:00',
-    // );
-    // endTime = moment(endTime).format(
-    //   'YYYY-MM-DD 23:59:59',
-    // );
     const sql = MpInfo.createQueryBuilder().where('id in (:...id)', {
       id,
     });
-    // if (startTime && endTime) {
-    //   sql.andWhere(`date between '${startTime}' and '${endTime}'`);
-    // }
     if (startTime) {
       sql.andWhere(`date >= '${startTime}'`);
     }
     return sql
-      .select('name')
-      .addSelect('icon')
-      .addSelect('id')
+      .select('id', 'id')
       .addSelect('num')
       .addSelect('date')
       .groupBy('date')
+      .addGroupBy('num')
       .addGroupBy('id')
       .orderBy('date', 'DESC')
       .getRawMany();
-    // } else {
-    //   const sql = MpInfo.createQueryBuilder();
-    //   if (startTime && endTime) {
-    //     sql.where(`date between ${startTime} and ${endTime}`);
-    //   }
-    //   return sql
-    //     .select('name')
-    //     .addSelect('icon')
-    //     .addSelect('id')
-    //     .addSelect('num')
-    //     .addSelect('date')
-    //     .getRawMany();
-    // }
   }
 
   async queryArchiveList({ areaCode, pageNo, pageSize, type }) {
diff --git a/src/client/client.service.ts b/src/client/client.service.ts
index f6d4a24..45aa5e2 100644
--- a/src/client/client.service.ts
+++ b/src/client/client.service.ts
@@ -120,10 +120,6 @@ export class ClientService {
     }
     const st = Time.getRecentDay(6)
     const info = await clientMapper.queryMpInfo({ id, startTime: st });
-    // const [count, info] = await Promise.all([
-    //   clientMapper.queryMpNum({ areaCode ,startTime, endTime}),
-    //   clientMapper.queryMpInfo({ areaCode, topLimit, startTime, endTime }),
-    // ]);
     info.forEach((e) => {
       if (obj[e.id]) {
         obj[e.id].dayNumList.push({