lanhee/Cockpit-RearEnd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改类型判断问题

Browse Source
This commit is contained in:
wuhan 2024-03-14 10:47:31 +08:00
parent b4c057065a
commit 510bba3d79
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/client/client.mapper.ts
View File

@ -294,16 +294,16 @@ class ClientMapper {
sql.andWhere(`date >= '${startTime}' `); sql.andWhere(`date >= '${startTime}' `);
} }
switch (dateRange) { switch (dateRange) {
case 1: case '1':
sql.select(`DATE_FORMAT(date,'%Y-%m-%d') time`); sql.select(`DATE_FORMAT(date,'%Y-%m-%d') time`);
break; break;
case 2: case '2':
sql.select(`DATE_FORMAT(date,'%Y-%u') time`); sql.select(`DATE_FORMAT(date,'%Y-%u') time`);
break; break;
case 3: case '3':
sql.select(`DATE_FORMAT(date,'%Y-%m') time`); sql.select(`DATE_FORMAT(date,'%Y-%m') time`);
break; break;
case 4: case '4':
sql.select(`DATE_FORMAT(date,'%Y') time`); sql.select(`DATE_FORMAT(date,'%Y') time`);
break; break;
default: default:

14
src/client/client.service.ts
View File

@ -330,21 +330,21 @@ export class ClientService {
/** /**
* 4.9获取平台家庭数据使用记录 * 4.9获取平台家庭数据使用记录
*/ */
async queryDataUseNum({ areaCode, dateRange = 1, limit = 7 }) { async queryDataUseNum({ areaCode, dateRange = '1', limit = 7 }) {
console.log('queryDataUseNum'); console.log('queryDataUseNum');
// const { startTime, endTime } = this.dealTime(dateRange); // const { startTime, endTime } = this.dealTime(dateRange);
//获取时间开始节点 //获取时间开始节点
let startTime: string; let startTime: string;
limit -= 1 limit -= 1
let array = [] as string[] let array = [] as string[]
if (dateRange == 1) { if (dateRange == '1') {
// 日 // 日
startTime = Time.getRecentDay(limit) startTime = Time.getRecentDay(limit)
array = Time.getRecentDays(limit, 1) array = Time.getRecentDays(limit, 1)
} else if (dateRange == 2) { } else if (dateRange == '2') {
// 周 废弃 // 周 废弃
startTime = Time.getRecentWeek(limit) startTime = Time.getRecentWeek(limit)
} else if (dateRange == 3) { } else if (dateRange == '3') {
// 月 // 月
limit = 5 limit = 5
startTime = Time.getRecentMonth(limit) startTime = Time.getRecentMonth(limit)
@ -355,12 +355,6 @@ export class ClientService {
startTime = Time.getRecentYear(limit) startTime = Time.getRecentYear(limit)
array = Time.getRecentDays(limit, 3) array = Time.getRecentDays(limit, 3)
} }
// const result = await clientMapper.queryDataUseNum({
// areaCode,
// startTime,
// limit,
// dateRange,
// });
const [result, count] = await Promise.all([ const [result, count] = await Promise.all([
clientMapper.queryDataUseNum({ clientMapper.queryDataUseNum({
areaCode, areaCode,