feat: complete remaining PRD tasks — RBAC nodes and staff split, schedule month view, auto-generate attendance from schedules, plus fix TypeORM name

apps/server/src/attendance/attendance.controller.ts

@@ -22,6 +22,7 @@ import {
   MatchDingRecordDto,
   AttendanceReportQueryDto,
   UpdateAttendanceRecordDto,
+  GenerateFromSchedulesDto,
 } from './dto/attendance.dto';
 import { JwtAuthGuard } from '../auth/guards/jwt-auth.guard';
 import { OperationLogsService } from '../operation-logs/operation-logs.service';
@@ -58,6 +59,28 @@ export class AttendanceController {
     return result;
   }
 
+  // ── Generate attendance records from schedules (with optional date range) ──
+  @Post('attendance-records/generate-from-schedules')
+  @RequirePermission('attendance:create')
+  async generateFromSchedules(
+    @Body() dto: GenerateFromSchedulesDto,
+    @Request() req: any,
+  ) {
+    const { ipAddress, userAgent } = extractRequestInfo(req);
+    const result = await this.service.generateFromSchedules(dto);
+    await this.logService.log({
+      userId: req.user?.id,
+      username: req.user?.username,
+      module: '考勤管理',
+      action: '按课表生成考勤',
+      detail: `班级 ${dto.classId}, 共 ${result.count} 条`,
+      ipAddress,
+      userAgent,
+    });
+    return result;
+  }
+
+
   // ── Export attendance records ──
   @Get('attendance-records/export')
   @RequirePermission('attendance:export')

apps/server/src/attendance/attendance.module.ts

@@ -1,13 +1,13 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { AttendanceRecord, DingAttendanceRaw, Student, Class } from '../entities';
+import { AttendanceRecord, DingAttendanceRaw, Student, Class, ClassSchedule, ClassStudent } from '../entities';
 import { AttendanceService } from './attendance.service';
 import { AttendanceController } from './attendance.controller';
 import { OperationLogsModule } from '../operation-logs/operation-logs.module';
 import { CommonModule } from '../common/common.module';
 @Module({
   imports: [
-    TypeOrmModule.forFeature([AttendanceRecord, DingAttendanceRaw, Student, Class]),
+    TypeOrmModule.forFeature([AttendanceRecord, DingAttendanceRaw, Student, Class, ClassSchedule, ClassStudent]),
     OperationLogsModule,
     CommonModule,
   ],

apps/server/src/attendance/attendance.service.spec.ts

@@ -25,7 +25,7 @@ describe('AttendanceService — batchCreate', () => {
       save: jest
         .fn()
         .mockImplementation((entities: AttendanceRecord[]) => {
-          const result = entities.map((e, i) => ({ ...e, id: i + 1 } as AttendanceRecord));
+          const result = entities.map((e, i) => ({ ...e, id: i + 1 }));
           savedRecords.push(...result);
           return Promise.resolve(result);
         }),

apps/server/src/attendance/attendance.service.ts

@@ -4,8 +4,8 @@ import {
   BadRequestException,
 } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
-import { Repository, In, Between } from 'typeorm';
-import { AttendanceRecord, DingAttendanceRaw, Class, Student } from '../entities';
+import { Repository, In, Between, LessThanOrEqual, MoreThanOrEqual } from 'typeorm';
+import { AttendanceRecord, DingAttendanceRaw, Class, Student, ClassSchedule, ClassStudent, ScheduleType } from '../entities';
 import { CampusScope } from '../common/campus-scope';
 import {
   BatchCreateAttendanceDto,
@@ -15,6 +15,8 @@ import {
   MatchDingRecordDto,
   AttendanceReportQueryDto,
   UpdateAttendanceRecordDto,
+  GenerateAttendanceFromSchedulesDto,
+  GenerateFromSchedulesDto,
 } from './dto/attendance.dto';
 
 @Injectable()
@@ -28,6 +30,10 @@ export class AttendanceService {
     private classRepo: Repository<Class>,
     @InjectRepository(Student)
     private studentRepo: Repository<Student>,
+    @InjectRepository(ClassSchedule)
+    private scheduleRepo: Repository<ClassSchedule>,
+    @InjectRepository(ClassStudent)
+    private classStudentRepo: Repository<ClassStudent>,
     private readonly scope: CampusScope,
   ) {}
 
@@ -60,6 +66,114 @@ export class AttendanceService {
     return { count: saved.length, records: saved };
   }
 
+  // ── Generate attendance records from class schedules ──
+  async generateAttendanceFromSchedules(dto: GenerateAttendanceFromSchedulesDto) {
+    const { classId, dateFrom, dateTo } = dto;
+
+    if (dateFrom > dateTo) {
+      throw new BadRequestException('dateFrom must not be later than dateTo');
+    }
+
+    const cls = await this.classRepo.findOne({ where: { id: classId } });
+    if (!cls) {
+      throw new NotFoundException(`Class ${classId} not found`);
+    }
+
+    const schedules = await this.scheduleRepo.find({
+      where: {
+        classId,
+        scheduleType: ScheduleType.INTERNAL,
+        status: 'active',
+        startDate: LessThanOrEqual(dateTo),
+        endDate: MoreThanOrEqual(dateFrom),
+      },
+    });
+
+    const classStudents = await this.classStudentRepo.find({
+      where: { classId, status: 'active' },
+      relations: ['student'],
+    });
+
+    if (schedules.length === 0 || classStudents.length === 0) {
+      return { count: 0, records: [] };
+    }
+
+    const existingRecords = await this.attendanceRepo.find({
+      where: { classId, attendanceDate: Between(dateFrom, dateTo) },
+    });
+    const existingKeys = new Set(
+      existingRecords.map((r) => `${r.studentId}|${r.attendanceDate}|${r.session}`),
+    );
+
+    const entities: AttendanceRecord[] = [];
+    const end = new Date(dateTo);
+    for (let d = new Date(dateFrom); d <= end; d.setDate(d.getDate() + 1)) {
+      const dateStr = d.toISOString().slice(0, 10);
+      const weekDay = d.getDay() === 0 ? 7 : d.getDay();
+
+      for (const sched of schedules) {
+        if (sched.weekDay !== weekDay) continue;
+        if (dateStr < sched.startDate || dateStr > sched.endDate) continue;
+
+        const session = this.mapScheduleTimeToSession(sched.startTime);
+        for (const cs of classStudents) {
+          const key = `${cs.studentId}|${dateStr}|${session}`;
+          if (existingKeys.has(key)) continue;
+
+          const entity = this.attendanceRepo.create({
+            studentId: cs.studentId,
+            classId,
+            attendanceDate: dateStr,
+            session,
+            status: 'pending',
+            source: 'schedule',
+          });
+          entity.departmentId = cs.student?.departmentId ?? cls.departmentId ?? undefined;
+          entities.push(entity);
+          existingKeys.add(key);
+        }
+      }
+    }
+
+    const saved = await this.attendanceRepo.save(entities);
+    return { count: saved.length, records: saved };
+  }
+
+  // ── Generate attendance records from schedules (optional date range, defaults to current week) ──
+  async generateFromSchedules(dto: GenerateFromSchedulesDto): Promise<{ count: number; records: AttendanceRecord[] }> {
+    const { classId, startDate, endDate } = dto;
+
+    // Default to current week (Monday–Sunday)
+    const now = new Date();
+    const dayOfWeek = now.getDay();
+    const mondayOffset = dayOfWeek === 0 ? -6 : 1 - dayOfWeek;
+    const monday = new Date(now);
+    monday.setDate(now.getDate() + mondayOffset);
+    monday.setHours(0, 0, 0, 0);
+    const sunday = new Date(monday);
+    sunday.setDate(monday.getDate() + 6);
+    sunday.setHours(23, 59, 59, 999);
+
+    const dateFrom = startDate ?? monday.toISOString().slice(0, 10);
+    const dateTo = endDate ?? sunday.toISOString().slice(0, 10);
+
+    return this.generateAttendanceFromSchedules({
+      classId,
+      dateFrom,
+      dateTo,
+    });
+  }
+
+
+  private mapScheduleTimeToSession(startTime: string): string {
+    const hour = parseInt(startTime.slice(0, 2), 10);
+    if (hour < 8) return 'morning_reading';
+    if (hour < 12) return 'morning';
+    if (hour < 17) return 'afternoon';
+    if (hour < 20) return 'evening_study';
+    return 'night_check';
+  }
+
   // ── Attendance summary ──
   async getSummary(query: AttendanceSummaryQueryDto) {
     const qb = this.attendanceRepo.createQueryBuilder('ar');

apps/server/src/attendance/dto/attendance.dto.ts

@@ -151,3 +151,33 @@ export class AttendanceReportQueryDto {
   @IsDateString()
   dateTo?: string;
 }
+
+export class GenerateAttendanceFromSchedulesDto {
+  @IsInt()
+  @Type(() => Number)
+  @IsNotEmpty()
+  classId: number;
+
+  @IsDateString()
+  @IsNotEmpty()
+  dateFrom: string;
+
+  @IsDateString()
+  @IsNotEmpty()
+  dateTo: string;
+}
+
+export class GenerateFromSchedulesDto {
+  @IsInt()
+  @Type(() => Number)
+  @IsNotEmpty()
+  classId: number;
+
+  @IsOptional()
+  @IsDateString()
+  startDate?: string;
+
+  @IsOptional()
+  @IsDateString()
+  endDate?: string;
+}