fix permissions and teacher attendance workflows

2026-07-10 20:40:52 +08:00
parent 247879f276
commit 8ed1682b90
95 changed files with 4745 additions and 1237 deletions
--- a/apps/server/src/attendance/attendance.service.ts
+++ b/apps/server/src/attendance/attendance.service.ts
@@ -5,7 +5,7 @@ import {
 } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { Repository, In, Between, LessThanOrEqual, MoreThanOrEqual } from 'typeorm';
-import { AttendanceRecord, DingAttendanceRaw, Class, Student, ClassSchedule, ClassStudent, ScheduleType, StudentDingMapping } from '../entities';
+import { AttendanceRecord, DingAttendanceRaw, Class, Student, ClassSchedule, ClassStudent, ClassTeacher, ScheduleType, StudentDingMapping } from '../entities';
 import {
  BatchCreateAttendanceDto,
  AttendanceSummaryQueryDto,
@@ -35,8 +35,83 @@ export class AttendanceService {
    private classStudentRepo: Repository<ClassStudent>,
    @InjectRepository(StudentDingMapping)
    private studentDingMappingRepo: Repository<StudentDingMapping>,
+    @InjectRepository(ClassTeacher)
+    private classTeacherRepo: Repository<ClassTeacher>,
  ) {}

+  async getAccessibleClassIds(userId: number, canManageAll = false): Promise<number[] | undefined> {
+    if (canManageAll) return undefined;
+    const assignments = await this.classTeacherRepo.find({ where: { userId } });
+    return [...new Set(assignments.map((assignment) => assignment.classId))];
+  }
+
+  async assertClassAccess(userId: number, classId: number, canManageAll = false): Promise<void> {
+    if (canManageAll) return;
+    const assignment = await this.classTeacherRepo.findOne({ where: { userId, classId } });
+    if (!assignment) throw new BadRequestException('只能访问自己任教班级的考勤');
+  }
+
+  /** List classes the current user may select for DingTalk attendance import. */
+  async getImportableClasses(userId: number, isSuperAdmin = false) {
+    if (isSuperAdmin) {
+      const classes = await this.classRepo.find({
+        where: { isArchived: false },
+        order: { name: 'ASC' },
+      });
+      return classes.map((item) => ({ classId: item.id, className: item.name }));
+    }
+
+    const assignments = await this.classTeacherRepo.find({
+      where: { userId },
+      relations: ['class'],
+    });
+    const classes = new Map<number, string>();
+    for (const assignment of assignments) {
+      if (assignment.class && !assignment.class.isArchived) {
+        classes.set(assignment.classId, assignment.class.name);
+      }
+    }
+    return [...classes.entries()]
+      .map(([classId, className]) => ({ classId, className }))
+      .sort((left, right) => left.className.localeCompare(right.className, 'zh-CN'));
+  }
+
+  /** Resolve the DingTalk users a teacher may import for one assigned class. */
+  async getTeacherClassDingUserIds(
+    userId: number,
+    classId: number,
+    isSuperAdmin = false,
+  ): Promise<string[]> {
+    if (!isSuperAdmin) {
+      const assignment = await this.classTeacherRepo.findOne({
+        where: { userId, classId },
+      });
+      if (!assignment) {
+        throw new BadRequestException('只能拉取自己任教班级的考勤记录');
+      }
+    } else {
+      const cls = await this.classRepo.findOne({ where: { id: classId } });
+      if (!cls) throw new NotFoundException(`Class ${classId} not found`);
+    }
+
+    const classStudents = await this.classStudentRepo.find({
+      where: { classId, status: 'active' },
+    });
+    const studentIds = [...new Set(classStudents.map((item) => item.studentId))];
+    if (studentIds.length === 0) {
+      throw new BadRequestException('该班级暂无在读学生');
+    }
+
+    const mappings = await this.studentDingMappingRepo.find({
+      where: { studentId: In(studentIds) },
+    });
+    const userIds = [...new Set(mappings.map((mapping) => mapping.dingUserId).filter(Boolean))];
+    if (userIds.length === 0) {
+      throw new BadRequestException('该班级学生尚未同步钉钉账号');
+    }
+    return userIds.sort();
+  }
+
  // ── Batch create attendance records ──
  async batchCreate(dto: BatchCreateAttendanceDto) {
    if (!dto.records || dto.records.length === 0) {
@@ -169,11 +244,15 @@ export class AttendanceService {
  }

  // ── Attendance summary ──
-  async getSummary(query: AttendanceSummaryQueryDto) {
+  async getSummary(query: AttendanceSummaryQueryDto, accessibleClassIds?: number[]) {
    const qb = this.attendanceRepo.createQueryBuilder('ar');
    if (query.classId) {
      qb.andWhere('ar.classId = :classId', { classId: query.classId });
    }
+    else if (accessibleClassIds) {
+      if (accessibleClassIds.length === 0) return { total: 0, present: 0, late: 0, absent: 0, leave: 0, presentRate: 0 };
+      qb.andWhere('ar.classId IN (:...accessibleClassIds)', { accessibleClassIds });
+    }
    if (query.dateFrom) {
      qb.andWhere('ar.attendanceDate >= :dateFrom', { dateFrom: query.dateFrom });
    }
@@ -267,7 +346,7 @@ export class AttendanceService {
    source?: string;
    page?: number;
    pageSize?: number;
-  }) {
+  }, accessibleClassIds?: number[]) {
    const page = query.page || 1;
    const pageSize = query.pageSize || 20;

@@ -278,6 +357,10 @@ export class AttendanceService {
    if (query.classId) {
      qb.andWhere('ar.classId = :classId', { classId: query.classId });
    }
+    else if (accessibleClassIds) {
+      if (accessibleClassIds.length === 0) return { list: [], total: 0, page, pageSize };
+      qb.andWhere('ar.classId IN (:...accessibleClassIds)', { accessibleClassIds });
+    }
    if (query.dateFrom) {
      qb.andWhere('ar.attendanceDate >= :dateFrom', { dateFrom: query.dateFrom });
    }
@@ -302,18 +385,18 @@ export class AttendanceService {
  }

  // ── Get distinct classes with attendance records ──
-  async getClasses() {
+  async getClasses(accessibleClassIds?: number[]) {
    const qb = this.attendanceRepo
      .createQueryBuilder('ar')
      .select('DISTINCT ar.classId', 'classId')
      .where('ar.classId IS NOT NULL');


-    const rows = await qb
-      .orderBy('ar.classId', 'ASC')
-      .getRawMany();
+    const rows = accessibleClassIds
+      ? accessibleClassIds.map((classId) => ({ classId }))
+      : await qb.orderBy('ar.classId', 'ASC').getRawMany();

-    const classIds = rows.map((r) => r.classId).filter(Boolean) as number[];
+    const classIds = [...new Set(rows.map((r) => Number(r.classId)).filter(Boolean))];
    if (classIds.length === 0) return [];

    const where = { id: In(classIds) };
@@ -323,17 +406,44 @@ export class AttendanceService {
  }

  // ── DingAttendance raw records ──
-  async getDingRaw(query: QueryDingRawDto) {
-    const where: any = {};
+  async getDingRaw(query: QueryDingRawDto, accessibleClassIds?: number[]) {
+    const page = query.page || 1;
+    const pageSize = query.pageSize || 20;
+    const qb = this.dingRawRepo.createQueryBuilder('ar');
+
+    qb.leftJoinAndSelect('ar.matchedStudent', 'matchedStudent');
    if (query.matchStatus) {
-      where.matchStatus = query.matchStatus;
+      qb.andWhere('ar.matchStatus = :matchStatus', { matchStatus: query.matchStatus });
+    }
+    if (query.dateFrom) {
+      qb.andWhere('ar.attendanceDate >= :dateFrom', { dateFrom: query.dateFrom });
+    }
+    if (query.dateTo) {
+      qb.andWhere('ar.attendanceDate <= :dateTo', { dateTo: query.dateTo });
+    }
+    const scopedClassIds = query.classId ? [query.classId] : accessibleClassIds;
+    if (scopedClassIds) {
+      if (scopedClassIds.length === 0) return { list: [], total: 0, page, pageSize };
+      const classStudents = await this.classStudentRepo.find({
+        where: { classId: In(scopedClassIds), status: 'active' },
+      });
+      const studentIds = [...new Set(classStudents.map((item) => item.studentId))];
+      if (studentIds.length === 0) return { list: [], total: 0, page, pageSize };
+      const mappings = await this.studentDingMappingRepo.find({
+        where: { studentId: In(studentIds) },
+      });
+      const dingUserIds = [...new Set(mappings.map((mapping) => mapping.dingUserId).filter(Boolean))];
+      if (dingUserIds.length === 0) return { list: [], total: 0, page, pageSize };
+      qb.andWhere('ar.dingUserId IN (:...dingUserIds)', { dingUserIds });
    }

-    return this.dingRawRepo.find({
-      where,
-      relations: ['matchedStudent'],
-      order: { attendanceDate: 'DESC', checkInTime: 'ASC' },
-    });
+    qb.orderBy('ar.attendanceDate', 'DESC')
+      .addOrderBy('ar.checkInTime', 'ASC')
+      .skip((page - 1) * pageSize)
+      .take(pageSize);
+
+    const [list, total] = await qb.getManyAndCount();
+    return { list, total, page, pageSize };
  }

  // ── Match a dingtalk record to a student ──
@@ -385,7 +495,7 @@ export class AttendanceService {
    session?: string;
    status?: string;
    source?: string;
-  }) {
+  }, accessibleClassIds?: number[]) {
    const qb = this.attendanceRepo.createQueryBuilder('ar');

    qb.leftJoinAndSelect('ar.student', 'student')
@@ -393,6 +503,10 @@ export class AttendanceService {
    if (query.classId) {
      qb.andWhere('ar.classId = :classId', { classId: query.classId });
    }
+    else if (accessibleClassIds) {
+      if (accessibleClassIds.length === 0) return [];
+      qb.andWhere('ar.classId IN (:...accessibleClassIds)', { accessibleClassIds });
+    }
    if (query.dateFrom) {
      qb.andWhere('ar.attendanceDate >= :dateFrom', { dateFrom: query.dateFrom });
    }
@@ -445,7 +559,7 @@ export class AttendanceService {
  }

  // ── Class-based attendance report ──
-  async getReport(query: AttendanceReportQueryDto) {
+  async getReport(query: AttendanceReportQueryDto, accessibleClassIds?: number[]) {
    const qb = this.attendanceRepo.createQueryBuilder('ar');

    qb.leftJoin('ar.class', 'class')
@@ -456,6 +570,10 @@ export class AttendanceService {
    if (query.classId) {
      qb.andWhere('ar.classId = :classId', { classId: query.classId });
    }
+    else if (accessibleClassIds) {
+      if (accessibleClassIds.length === 0) return [];
+      qb.andWhere('ar.classId IN (:...accessibleClassIds)', { accessibleClassIds });
+    }
    if (query.dateFrom) {
      qb.andWhere('ar.attendanceDate >= :dateFrom', { dateFrom: query.dateFrom });
    }
@@ -509,7 +627,7 @@ export class AttendanceService {
    });
  }
  // ── Attendance alerts: detect consecutive absences/late ──
-  async getAlerts(days: number = 14, threshold: number = 3) {
+  async getAlerts(days: number = 14, threshold: number = 3, accessibleClassIds?: number[]) {
    const cutoff = new Date();
    cutoff.setDate(cutoff.getDate() - days);
    const cutoffStr = cutoff.toISOString().slice(0, 10);
@@ -520,9 +638,13 @@ export class AttendanceService {
      .leftJoinAndSelect('a.class', 'class');


+    qb.where('a.attendanceDate >= :cutoff', { cutoff: cutoffStr })
+      .andWhere('a.status IN (:...statuses)', { statuses: ['absent', 'late'] });
+    if (accessibleClassIds) {
+      if (accessibleClassIds.length === 0) return [];
+      qb.andWhere('a.classId IN (:...accessibleClassIds)', { accessibleClassIds });
+    }
    const records = await qb
-      .where('a.attendanceDate >= :cutoff', { cutoff: cutoffStr })
-      .andWhere('a.status IN (:...statuses)', { statuses: ['absent', 'late'] })
      .orderBy('a.studentId', 'ASC')
      .addOrderBy('a.attendanceDate', 'DESC')
      .getMany();