From 510bba3d795a165085d79bc7ab7ae95d9dab9acf Mon Sep 17 00:00:00 2001
From: wuhan <18852676227@163.com>
Date: Thu, 14 Mar 2024 10:47:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B1=BB=E5=9E=8B=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=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  |  8 ++++----
 src/client/client.service.ts | 14 ++++----------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/client/client.mapper.ts b/src/client/client.mapper.ts
index b79cda4..37ea333 100644
--- a/src/client/client.mapper.ts
+++ b/src/client/client.mapper.ts
@@ -294,16 +294,16 @@ class ClientMapper {
       sql.andWhere(`date >= '${startTime}' `);
     }
     switch (dateRange) {
-      case 1:
+      case '1':
         sql.select(`DATE_FORMAT(date,'%Y-%m-%d') time`);
         break;
-      case 2:
+      case '2':
         sql.select(`DATE_FORMAT(date,'%Y-%u') time`);
         break;
-      case 3:
+      case '3':
         sql.select(`DATE_FORMAT(date,'%Y-%m') time`);
         break;
-      case 4:
+      case '4':
         sql.select(`DATE_FORMAT(date,'%Y') time`);
         break;
       default:
diff --git a/src/client/client.service.ts b/src/client/client.service.ts
index 603048f..64f9030 100644
--- a/src/client/client.service.ts
+++ b/src/client/client.service.ts
@@ -330,21 +330,21 @@ export class ClientService {
   /**
    * 4.9获取平台家庭数据使用记录
    */
-  async queryDataUseNum({ areaCode, dateRange = 1, limit = 7 }) {
+  async queryDataUseNum({ areaCode, dateRange = '1', limit = 7 }) {
     console.log('queryDataUseNum');
     // const { startTime, endTime } = this.dealTime(dateRange);
     //获取时间开始节点
     let startTime: string;
     limit -= 1
     let array = [] as string[]
-    if (dateRange == 1) {
+    if (dateRange == '1') {
       // 日
       startTime = Time.getRecentDay(limit)
       array = Time.getRecentDays(limit, 1)
-    } else if (dateRange == 2) {
+    } else if (dateRange == '2') {
       // 周 废弃
       startTime = Time.getRecentWeek(limit)
-    } else if (dateRange == 3) {
+    } else if (dateRange == '3') {
       // 月
       limit = 5
       startTime = Time.getRecentMonth(limit)
@@ -355,12 +355,6 @@ export class ClientService {
       startTime = Time.getRecentYear(limit)
       array = Time.getRecentDays(limit, 3)
     }
-    // const result = await clientMapper.queryDataUseNum({
-    //   areaCode,
-    //   startTime,
-    //   limit,
-    //   dateRange,
-    // });
     const [result, count] = await Promise.all([
       clientMapper.queryDataUseNum({
         areaCode,