chore(statistics-module): 优化代码风格并增强类型检查

- 移除变量名中的下划线前缀，统一命名风格
- 简化集成测试数据，移除冗余字段
- 添加 lint-staged 类型检查钩子，只对修改文件的包运行 typecheck

Co-Authored-By: Claude <noreply@anthropic.com>

.husky/lint-staged-typecheck.js

@@ -0,0 +1,71 @@
+#!/usr/bin/env node
+
+/**
+ * Lint-staged 类型检查脚本
+ * 只对修改的文件所在的包运行 typecheck
+ */
+
+const { execSync } = require('child_process');
+const path = require('path');
+const fs = require('fs');
+
+// 获取命令行传入的文件列表
+const files = process.argv.slice(2);
+
+if (!files || files.length === 0) {
+  process.exit(0);
+}
+
+// 获取项目根目录（假设脚本在 .husky 目录下）
+const projectRoot = path.resolve(__dirname, '..');
+
+// 找出包含修改文件的包目录
+const packagesToCheck = new Set();
+
+for (const file of files) {
+  // 转换为绝对路径
+  const absolutePath = path.resolve(projectRoot, file);
+
+  // 解析文件路径，找到包含 package.json 的目录
+  let currentDir = path.dirname(absolutePath);
+
+  while (currentDir !== projectRoot && currentDir !== '/' && path.dirname(currentDir) !== currentDir) {
+    const pkgJsonPath = path.join(currentDir, 'package.json');
+
+    if (fs.existsSync(pkgJsonPath)) {
+      try {
+        const pkgJson = JSON.parse(fs.readFileSync(pkgJsonPath, 'utf8'));
+        // 检查是否有 typecheck 脚本
+        if (pkgJson.scripts && pkgJson.scripts.typecheck) {
+          packagesToCheck.add(currentDir);
+          break;
+        }
+      } catch (_e) {
+        // 忽略解析错误
+      }
+    }
+    currentDir = path.dirname(currentDir);
+  }
+}
+
+if (packagesToCheck.size === 0) {
+  process.exit(0);
+}
+
+// 对每个包运行 typecheck
+const failedPackages = [];
+for (const pkgDir of packagesToCheck) {
+  try {
+    execSync('pnpm run typecheck', {
+      cwd: pkgDir,
+      stdio: 'inherit',
+      timeout: 60000
+    });
+  } catch (_error) {
+    failedPackages.push(pkgDir);
+  }
+}
+
+if (failedPackages.length > 0) {
+  process.exit(1);
+}

allin-packages/statistics-module/src/services/statistics.service.ts

@@ -381,8 +381,8 @@ export class StatisticsService {
   }> {
     const { year, month } = query;
     const now = new Date();
-    const _targetYear = year ?? now.getFullYear();
-    const _targetMonth = month ?? now.getMonth() + 1;
+    const targetYear = year ?? now.getFullYear();
+    const targetMonth = month ?? now.getMonth() + 1;
 
     // 计算上个月
     const previousDate = new Date(targetYear, targetMonth - 2, 1);
@@ -394,8 +394,8 @@ export class StatisticsService {
     const _endDate = new Date(targetYear, targetMonth, 0, 23, 59, 59);
 
     // 构建日期范围（上月）
-    const _previousStartDate = new Date(previousYear, previousMonth - 1, 1);
-    const _previousEndDate = new Date(previousYear, previousMonth, 0, 23, 59, 59);
+    const _previousStartDate = new Date(_previousYear, _previousMonth - 1, 1);
+    const _previousEndDate = new Date(_previousYear, _previousMonth, 0, 23, 59, 59);
 
     // 获取在职人员（jobStatus = 1）
     const personIds = await this.getCompanyDisabledPersonIds(companyId);
@@ -441,8 +441,8 @@ export class StatisticsService {
   }> {
     const { year, month } = query;
     const now = new Date();
-    const _targetYear = year ?? now.getFullYear();
-    const _targetMonth = month ?? now.getMonth() + 1;
+    const targetYear = year ?? now.getFullYear();
+    const targetMonth = month ?? now.getMonth() + 1;
 
     // 计算上个月
     const previousDate = new Date(targetYear, targetMonth - 2, 1);
@@ -551,8 +551,8 @@ export class StatisticsService {
   }> {
     const { year, month } = query;
     const now = new Date();
-    const _targetYear = year ?? now.getFullYear();
-    const _targetMonth = month ?? now.getMonth() + 1;
+    const targetYear = year ?? now.getFullYear();
+    const targetMonth = month ?? now.getMonth() + 1;
 
     // 计算上个月
     const previousDate = new Date(targetYear, targetMonth - 2, 1);
@@ -560,12 +560,12 @@ export class StatisticsService {
     const _previousMonth = previousDate.getMonth() + 1;
 
     // 构建日期范围（当月）
-    const _startDate = new Date(targetYear, targetMonth - 1, 1);
-    const _endDate = new Date(targetYear, targetMonth, 0, 23, 59, 59);
+    const startDate = new Date(targetYear, targetMonth - 1, 1);
+    const endDate = new Date(targetYear, targetMonth, 0, 23, 59, 59);
 
     // 构建日期范围（上月）
-    const _previousStartDate = new Date(previousYear, previousMonth - 1, 1);
-    const _previousEndDate = new Date(previousYear, previousMonth, 0, 23, 59, 59);
+    const previousStartDate = new Date(_previousYear, _previousMonth - 1, 1);
+    const previousEndDate = new Date(_previousYear, _previousMonth, 0, 23, 59, 59);
 
     // 获取当月新增人数（通过订单创建时间）
     const currentCount = await this.employmentOrderRepository

allin-packages/statistics-module/tests/integration/statistics.integration.test.ts

@@ -33,8 +33,8 @@ setupIntegrationDatabaseHooksWithEntities([
 ])
 
 describe('数据统计API集成测试', () => {
-  let client: ReturnType<typeof testClient<typeof statisticsRoutes>>;
-  let testToken: string;
+  let _client: ReturnType<typeof testClient<typeof statisticsRoutes>>;
+  let _testToken: string;
   let testUser: UserEntity;
   let testCompany: Company;
   let testDisabledPerson: DisabledPerson;
@@ -44,7 +44,7 @@ describe('数据统计API集成测试', () => {
 
   beforeEach(async () => {
     // 创建测试客户端
-    client = testClient(statisticsRoutes);
+    _client = testClient(statisticsRoutes);
 
     // 获取数据源
     dataSource = await IntegrationTestDatabase.getDataSource();
@@ -60,7 +60,7 @@ describe('数据统计API集成测试', () => {
     await userRepository.save(testUser);
 
     // 生成测试用户的token
-    testToken = JWTUtil.generateToken({
+    _testToken = JWTUtil.generateToken({
       id: testUser.id,
       username: testUser.username,
       roles: [{name:'user'}]
@@ -139,8 +139,7 @@ describe('数据统计API集成测试', () => {
       companyId: testCompany.id,
       channelId: 1,
       expectedStartDate: new Date(),
-      orderStatus: OrderStatus.CONFIRMED,
-      workStatus: WorkStatus.WORKING
+      orderStatus: OrderStatus.CONFIRMED
     });
     await orderRepository.save(testOrder);
 

package.json

@@ -88,6 +88,7 @@
   "lint-staged": {
     "*.{ts,tsx,js,jsx}": [
       "eslint --fix"
-    ]
+    ],
+    "*.{ts,tsx}": "node .husky/lint-staged-typecheck.js"
   }
 }