xiongyuxing/gongxue-base
1
0
Fork 0
forked from wangziqi/gongxue-base
Code Pull Requests Activity

refactor: resolve remaining field audit issues

Browse Source
This commit is contained in:
wangziqi
2026-07-13 15:12:36 +08:00
parent 0533c30ece
commit aa1ed7db56
34 changed files with 953 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/server/src/dashboard/dashboard.service.ts
View File

@@ -124,7 +124,7 @@ export class DashboardService {
const pendingDeposits = parseFloat(pendingResult?.total || '0');
const activeRentals = await this.rentalRepo.count({
where: { endDate: MoreThanOrEqual(todayStr) },
where: { status: 'active' as const, endDate: MoreThanOrEqual(todayStr) },
});
const occByBldQb = this.occRepo
@@ -365,7 +365,7 @@ export class DashboardService {
async getClassroomOccupancy() {
const classrooms = await this.classroomRepo.find({
where: { status: Not('archived') },
where: { status: 'available' as const },
order: { building: 'ASC', name: 'ASC' },
});
const today = new Date().toISOString().slice(0, 10);
@@ -382,7 +382,7 @@ export class DashboardService {
.createQueryBuilder('r')
.select('r.classroomId', 'classroomId')
.addSelect('COUNT(*)', 'rentalCount')
.where('r.status != :cancelled', { cancelled: 'cancelled' })
.where('r.status = :active', { active: 'active' })
.andWhere('r.startDate <= :today AND r.endDate >= :today', { today })
.groupBy('r.classroomId');
const rentals = await rentalQb.getRawMany();
@@ -402,7 +402,7 @@ export class DashboardService {
async getClassroomUtilizationStats() {
const totalClassrooms = await this.classroomRepo.count({
where: { status: Not('archived') },
where: { status: 'available' as const },
});
const today = new Date().toISOString().slice(0, 10);
@@ -420,7 +420,7 @@ export class DashboardService {
const rentalQb = this.rentalRepo
.createQueryBuilder('r')
.select('COUNT(DISTINCT r.classroomId)', 'cnt')
.where('r.status != :cancelled', { cancelled: 'cancelled' })
.where('r.status = :active', { active: 'active' })
.andWhere('r.startDate <= :today AND r.endDate >= :today', { today });
const rentalResult = await rentalQb.getRawOne();
@@ -437,7 +437,7 @@ export class DashboardService {
const combinedRentalQb = this.rentalRepo
.createQueryBuilder('r')
.select('r.classroomId')
.where('r.status != :cancelled', { cancelled: 'cancelled' })
.where('r.status = :active', { active: 'active' })
.andWhere('r.startDate <= :today AND r.endDate >= :today', { today })
.groupBy('r.classroomId');
const rentalIds = await combinedRentalQb.getRawMany();