From def0fe3a1ff16f716c61237d09c32608a364e91a Mon Sep 17 00:00:00 2001
From: selfrelease <freedak.ipad@gmail.com>
Date: Mon, 17 Aug 2026 09:59:21 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=88=A0=E9=99=A4=20PRE=5FONBOARD?=
 =?UTF-8?q?=20=E6=98=BE=E5=BC=8F=E7=8A=B6=E6=80=81=EF=BC=8C=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80=E6=8C=89=E5=85=A5=E8=81=8C=E6=97=A5=E6=9C=9F=E5=88=A4?=
 =?UTF-8?q?=E5=AE=9A=E9=A2=84=E5=85=A5=E8=81=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

预入职不再需要显式设置 PRE_ONBOARD 状态，统一按入职日期自动
判定：入职日期在未来 = 预入职（不进入薪资），入职日期 <= 今天
= 正式在职。

删除内容：
- schema: EmployeeStatus 枚举移除 PRE_ONBOARD
- roster.routes.ts: 移除 PRE_ONBOARD 筛选和 /activate API
- payroll2.routes.ts: 移除 NOT PRE_ONBOARD 排除条件
- modals.tsx: 移除入职状态选择器

保留：按 hireDate > 今天 自动判定预入职的逻辑

Generated with [Devin](https://devin.ai)

Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
---
 backend/prisma/schema.prisma          |  1 -
 backend/src/routes/payroll2.routes.ts |  2 --
 backend/src/routes/roster.routes.ts   | 27 +++------------------------
 frontend/src/pages/roster/modals.tsx  |  3 +--
 4 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/backend/prisma/schema.prisma b/backend/prisma/schema.prisma
index 75db5e1..9be639e 100644
--- a/backend/prisma/schema.prisma
+++ b/backend/prisma/schema.prisma
@@ -24,7 +24,6 @@ enum Role {
 }
 
 enum EmployeeStatus {
-  PRE_ONBOARD  // 预入职：已录入但未正式入职，不进入薪资批次
   ACTIVE
   RESIGNED
   TERMINATED
diff --git a/backend/src/routes/payroll2.routes.ts b/backend/src/routes/payroll2.routes.ts
index ead5c76..f0d6eb9 100644
--- a/backend/src/routes/payroll2.routes.ts
+++ b/backend/src/routes/payroll2.routes.ts
@@ -340,8 +340,6 @@ router.post('/batches', async (req: AuthRequest, res: Response, next: NextFuncti
               { status: 'ACTIVE' },
               { status: 'RESIGNED', updatedAt: { gte: monthStart, lte: monthEnd } },
             ],
-            // 预入职员工不进入薪资批次
-            NOT: { status: 'PRE_ONBOARD' },
           },
           include: { contracts: { orderBy: { createdAt: 'desc' }, take: 1 } },
         })
diff --git a/backend/src/routes/roster.routes.ts b/backend/src/routes/roster.routes.ts
index e1cad0e..04d2e29 100644
--- a/backend/src/routes/roster.routes.ts
+++ b/backend/src/routes/roster.routes.ts
@@ -101,17 +101,12 @@ router.get('/', authMiddleware, async (req: AuthRequest, res, next) => {
     if (status === 'RESIGNED') {
       whereBase.status = 'RESIGNED'
     } else if (status === 'PRE_HIRE' || status === 'PRE_ONBOARD') {
-      // 预入职：PRE_ONBOARD 状态，或 ACTIVE 状态但入职日期在未来
-      whereBase.OR = [
-        { status: 'PRE_ONBOARD' },
-        { status: 'ACTIVE', hireDate: { gt: todayEnd } },
-      ]
+      // 预入职：ACTIVE 状态但入职日期在未来（按入职日期自动判定）
+      whereBase.status = 'ACTIVE'
+      whereBase.hireDate = { gt: todayEnd }
     } else if (status === 'ACTIVE') {
       whereBase.status = 'ACTIVE'
       whereBase.hireDate = { lte: todayEnd }
-    } else if (!status) {
-      // 无状态过滤时，排除 PRE_ONBOARD（默认只看在职和离职）
-      whereBase.NOT = { status: 'PRE_ONBOARD' }
     }
 
     // unsigned 合同状态可以在 DB 层过滤
@@ -1606,20 +1601,4 @@ router.get('/contract-types', authMiddleware, (_req: AuthRequest, res) => {
   res.json({ success: true, data: types })
 })
 
-// 预入职转正式（PRE_ONBOARD → ACTIVE）
-router.post('/:id/activate', authMiddleware, async (req: AuthRequest, res, next) => {
-  try {
-    const emp = await prisma.employee.findFirst({ where: { id: req.params.id, orgId: req.user!.orgId! } })
-    if (!emp) return res.status(404).json({ success: false, error: { code: 'NOT_FOUND', message: '员工不存在' } })
-    if (emp.status !== 'PRE_ONBOARD') {
-      return res.status(400).json({ success: false, error: { code: 'BAD_REQUEST', message: '该员工不是预入职状态' } })
-    }
-    const updated = await prisma.employee.update({
-      where: { id: emp.id },
-      data: { status: 'ACTIVE' },
-    })
-    res.json({ success: true, data: { id: updated.id, status: updated.status } })
-  } catch (err) { next(err) }
-})
-
 export default router
diff --git a/frontend/src/pages/roster/modals.tsx b/frontend/src/pages/roster/modals.tsx
index 3bf263d..13b48d3 100644
--- a/frontend/src/pages/roster/modals.tsx
+++ b/frontend/src/pages/roster/modals.tsx
@@ -705,7 +705,7 @@ export function AddEmployeeModal({ onClose, onSubmit, loading, error }: {
     return {
       name: '', department: '', departmentId: '', position: '', hireDate: todayStr, monthlySalary: '',
       idCardNumber: '', gender: '男' as '男' | '女', femaleWorkerType: '' as '' | 'CADRE' | 'WORKER', phone: '',
-      city: '北京', education: '', status: 'ACTIVE' as 'ACTIVE' | 'PRE_ONBOARD',
+      city: '北京', education: '', status: 'ACTIVE',
       contractType: 'FIXED' as 'FIXED' | 'UNFIXED' | 'UNSIGNED',
       signDate: '', startDate: todayStr, endDate: defaultEndDate,
       contractYears: 3, probationMonths: 0, probationSalary: 0,
@@ -1016,7 +1016,6 @@ export function AddEmployeeModal({ onClose, onSubmit, loading, error }: {
         </div>
         <div className="grid grid-cols-4 gap-4">
           <div><Label>入职日期 *</Label><Input type="date" value={form.hireDate} onChange={(e) => handleHireDateChange(e.target.value)} /></div>
-          <div><Label>入职状态</Label><Select value={form.status} onChange={(e) => setForm({ ...form, status: e.target.value as 'ACTIVE' | 'PRE_ONBOARD' })}><option value="ACTIVE">正式入职</option><option value="PRE_ONBOARD">预入职（不进入薪资）</option></Select></div>
           <div><Label>月工资 *</Label><Input type="number" value={form.monthlySalary} onChange={(e) => setForm({ ...form, monthlySalary: e.target.value })} placeholder="元" /></div>
           <div><Label>手机号</Label><Input value={form.phone} onChange={(e) => {
             const phone = e.target.value.replace(/\D/g, '').slice(0, 11)