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

fix: 修复考勤控制器 DI 解析与班级日期迁移空 SQL

Browse Source
This commit is contained in:
wangziqi
2026-08-05 17:46:11 +08:00
parent 47720a8fcc
commit 1e1e24f0f0
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/server/src/attendance/attendance-records.controller.ts
View File

@@ -1,6 +1,8 @@
import { Controller, Get, Post, Put, Delete, Body, Param, Query, Request, Res, BadRequestException, ForbiddenException, ParseIntPipe } from '@nestjs/common'; import { Controller, Get, Post, Put, Delete, Body, Param, Query, Request, Res, BadRequestException, ForbiddenException, ParseIntPipe } from '@nestjs/common';
import type { Response } from 'express'; import type { Response } from 'express';
import { AttendanceControllerBase, RequestUser } from './attendance.controller-base'; import { AttendanceControllerBase, RequestUser } from './attendance.controller-base';
import { AttendanceService } from './attendance.service';
import { AttendanceImportService } from './attendance-import.service';
import { OperationLogsService } from '../operation-logs/operation-logs.service'; import { OperationLogsService } from '../operation-logs/operation-logs.service';
import { AuthorizationService } from '../authorization'; import { AuthorizationService } from '../authorization';
import { logAudit } from '../common/with-audit-log'; import { logAudit } from '../common/with-audit-log';
@@ -23,8 +25,8 @@ import * as ExcelJS from 'exceljs';
@Controller() @Controller()
export class AttendanceRecordsController extends AttendanceControllerBase { export class AttendanceRecordsController extends AttendanceControllerBase {
constructor( constructor(
service: import('./attendance.service').AttendanceService, service: AttendanceService,
importService: import('./attendance-import.service').AttendanceImportService, importService: AttendanceImportService,
logService: OperationLogsService, logService: OperationLogsService,
authz: AuthorizationService, authz: AuthorizationService,
) { ) {

2
apps/server/src/database/database-migrations.backfill.ts
View File

@@ -139,8 +139,8 @@ export async function normalizeClassDates(
const type = String(column?.type ?? '').toLowerCase(); const type = String(column?.type ?? '').toLowerCase();
return !['date', 'datetime', 'timestamp'].includes(type); return !['date', 'datetime', 'timestamp'].includes(type);
}); });
if (columns.length === 0) return;
}); });
if (columns.length === 0) return;
const columnText = (column: string) => `CAST(${column} AS CHAR)`; const columnText = (column: string) => `CAST(${column} AS CHAR)`;
const firstTenChars = (column: string) => `NULLIF(LEFT(${columnText(column)}, 10), '')`; const firstTenChars = (column: string) => `NULLIF(LEFT(${columnText(column)}, 10), '')`;