R62 Fix A1-A6：请假预览全非工作日处理
这个提交包含在：
@@ -90,6 +90,7 @@ export type LeaveWorkingDaysPreview = {
|
||||
weekendDayCount: number;
|
||||
adjustedWorkdayCount: number;
|
||||
calendarApplied: boolean;
|
||||
isNonWorkingRange: boolean;
|
||||
};
|
||||
|
||||
export type LeaveListQuery = {
|
||||
|
||||
@@ -303,6 +303,7 @@ export function LeaveRequestPage() {
|
||||
|
||||
const effectiveRequestedDaysPreview =
|
||||
workingDaysPreviewQuery.data?.requestedDays ?? localRequestedDaysPreview;
|
||||
const isNonWorkingPreview = Boolean(workingDaysPreviewQuery.data?.isNonWorkingRange);
|
||||
|
||||
const balanceSummary = useMemo(() => {
|
||||
return (balancesQuery.data?.items ?? []).reduce(
|
||||
@@ -784,7 +785,15 @@ export function LeaveRequestPage() {
|
||||
</p>
|
||||
) : null}
|
||||
|
||||
{workingDaysPreviewQuery.data && workingDaysPreviewQuery.data.holidayDayCount > 0 ? (
|
||||
{isNonWorkingPreview ? (
|
||||
<p className="rounded-lg border border-zinc-200 bg-zinc-50 px-3 py-2 text-sm text-zinc-700">
|
||||
所选日期范围均为非工作日，无需提交请假
|
||||
</p>
|
||||
) : null}
|
||||
|
||||
{workingDaysPreviewQuery.data &&
|
||||
!isNonWorkingPreview &&
|
||||
workingDaysPreviewQuery.data.holidayDayCount > 0 ? (
|
||||
<p className="rounded-lg border border-sky-200 bg-sky-50 px-3 py-2 text-sm text-sky-700">
|
||||
选择的日期范围内包含 {workingDaysPreviewQuery.data.holidayDayCount} 天法定假日，实际请假天数为{" "}
|
||||
{workingDaysPreviewQuery.data.requestedDays} 天
|
||||
@@ -893,7 +902,7 @@ export function LeaveRequestPage() {
|
||||
) : null}
|
||||
<Button
|
||||
type="button"
|
||||
disabled={isSavingForm}
|
||||
disabled={isSavingForm || isNonWorkingPreview}
|
||||
onClick={() => {
|
||||
if (editingLeaveRequest) {
|
||||
updateMutation.mutate();
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
ID,Title,Description,Acceptance,Test_Method,Tools,Dev_Status,Review1_Status,Regression_Status,Files,Dependencies,Notes
|
||||
"A1","R62 Fix 执行合同建档与范围冻结","创建并校验 R62 剩余边界修复执行合同 CSV，范围固定为：1) leave working-days 预览对全非工作日区间返回 0 天而非报错；2) 创建/编辑请假仍拒绝 0 天；3) 请假页显示“无需提交请假”且不再回退本地自然日；4) QA 收口。","issues/2026-04-14_r62-preview-non-working-fix.csv 列完整、Dependencies 为 JSON 数组字符串，修复范围仅覆盖全非工作日预览边界，不扩展到其他 leave/holiday 行为。","命令：python3 /home/shunli/.codex/skills/plan/scripts/validate_issues_csv.py issues/2026-04-14_r62-preview-non-working-fix.csv。检查：1) 对照 AGENTS.md 确认 12 列完整；2) A2-A6 依赖合理；3) Notes 写明无迁移、回滚方式。","manual","DONE","DONE","DONE","issues/2026-04-14_r62-preview-non-working-fix.csv","[]","回滚路径：删除本次 CSV 不影响业务。无 Prisma 迁移、无新依赖。"
|
||||
"A2","后端预览接口对全非工作日区间返回 0 天","调整 leave 工作日预览逻辑：`GET /api/leave-requests/working-days` 在区间全部落入 holiday/weekend 时返回 `200`，携带 `requestedDays=0`、分类计数和 `isNonWorkingRange=true`，不再抛 `non_working_range`。","1) 预览接口对全假期/全周末区间返回 200；2) 返回字段包含 `requestedDays,naturalRequestedDays,holidayDayCount,weekendDayCount,adjustedWorkdayCount,calendarApplied,isNonWorkingRange`；3) 非全非工作日场景保持原结果不变。","命令：export PATH=/home/shunli/.nvm/versions/node/v22.20.0/bin:$PATH && cd server && node --check src/services/leave.js && node --check src/routes/leave.js。业务：1) 预览 `2026-05-01~2026-05-05` 返回 0 天且 `holidayDayCount=5`；2) 预览 `2026-04-30~2026-05-05` 返回 1 天。","manual","DONE","DONE","DONE","server/src/services/leave.js|server/src/routes/leave.js|server/tests/unit/services/leave.test.js|server/tests/unit/routes/leave.working-days.test.js","[""A1""]","回滚路径：恢复 preview helper 对 `requestedUnits<=0` 直接抛错。"
|
||||
"A3","创建/编辑请假继续拒绝 0 天请假单","保持真实业务提交约束：创建/编辑请假单时，如果工作日计算结果为 0 天，仍返回 `VALID_001/non_working_range`，避免生成 0 天草稿或提交单。","1) 仅预览接口放宽为可返回 0 天；2) `POST /api/leave-requests` 与 `PATCH /api/leave-requests/:id` 对 0 天区间仍拒绝；3) 与 R62 其他节假日扣减口径一致。","命令：export PATH=/home/shunli/.nvm/versions/node/v22.20.0/bin:$PATH && cd server && node --check src/routes/leave.js && npm test -- tests/unit/routes/leave.working-days.test.js tests/unit/services/leave.test.js。业务：尝试提交全假期区间时，接口仍拒绝创建 0 天请假。","manual","DONE","DONE","DONE","server/src/routes/leave.js|server/tests/unit/routes/leave.working-days.test.js","[""A2""]","回滚路径：恢复创建/编辑共享旧逻辑。"
|
||||
"A4","前端请假页显示无需请假提示且不回退自然日","调整 LeaveRequestPage：当预览接口返回 `requestedDays=0` 且 `isNonWorkingRange=true` 时，页面展示“所选日期范围均为非工作日，无需提交请假”，本次预估显示 0，不再因为 query error 回退到本地自然日 5 天；创建/保存按钮保持不可提交。","1) `2026-05-01~2026-05-05` 页面显示 0 天与无需请假提示；2) 不再显示通用“工作日预览失败”提示；3) 非全非工作日场景仍可正常显示法定假日提示与预估天数。","命令：export PATH=/home/shunli/.nvm/versions/node/v22.20.0/bin:$PATH && cd client && npm run typecheck && npm run build。业务：1) 选全假期区间显示 0 天与无需请假提示；2) 选跨工作日+假期区间仍显示“包含 X 天法定假日”。","manual","DONE","DONE","DONE","client/src/api/leave.ts|client/src/pages/LeaveRequestPage.tsx","[""A2"",""A3""]","回滚路径：移除前端 `isNonWorkingRange` 分支，恢复原提示逻辑。"
|
||||
"A5","测试补齐全非工作日预览边界","补齐后端单测，覆盖全非工作日预览返回 0、跨假期区间返回有效工作日、创建/编辑仍拒绝 0 天区间。","1) leave service/route 单测覆盖全非工作日预览返回 0；2) 不影响现有跨假期扣减测试；3) 创建/编辑约束保持。","命令：export PATH=/home/shunli/.nvm/versions/node/v22.20.0/bin:$PATH && cd server && npm test -- tests/unit/services/leave.test.js tests/unit/routes/leave.working-days.test.js。业务：全假期区间预览返回 0，提交仍拒绝。","manual","DONE","DONE","DONE","server/tests/unit/services/leave.test.js|server/tests/unit/routes/leave.working-days.test.js","[""A2"",""A3""]","回滚路径：删除新增断言与测试数据。"
|
||||
"A6","QA、状态回填与提交收口","执行静态检查、单测、前端构建，回填 CSV 状态并提交。","受影响检查与测试通过；issues/2026-04-14_r62-preview-non-working-fix.csv 三列状态全部回填；提交信息引用本轮 Issue。","命令：python3 /home/shunli/.codex/skills/plan/scripts/validate_issues_csv.py issues/2026-04-14_r62-preview-non-working-fix.csv && export PATH=/home/shunli/.nvm/versions/node/v22.20.0/bin:$PATH && cd server && node --check src/services/leave.js && node --check src/routes/leave.js && npm test -- tests/unit/services/leave.test.js tests/unit/routes/leave.working-days.test.js && cd ../client && npm run typecheck && npm run build。业务：1) 全假期预览显示 0 天；2) 提交仍拒绝 0 天；3) 跨假期区间预估仍正确。","manual","DONE","DONE","DONE","issues/2026-04-14_r62-preview-non-working-fix.csv|server/src/services/leave.js|server/src/routes/leave.js|server/tests/unit/services/leave.test.js|server/tests/unit/routes/leave.working-days.test.js|client/src/api/leave.ts|client/src/pages/LeaveRequestPage.tsx","[""A5""]","回滚路径：若 post-check 失败，暂停提交并回退 R62 Fix 代码。commit message：R62 Fix A1-A6：请假预览全非工作日处理。"
|
||||
|
+11
-3
@@ -233,10 +233,13 @@ function buildNaturalWorkingDaysPreview(body) {
|
||||
weekendDayCount: 0,
|
||||
adjustedWorkdayCount: 0,
|
||||
calendarApplied: false,
|
||||
isNonWorkingRange: false,
|
||||
};
|
||||
}
|
||||
|
||||
async function resolveWorkingDaysPreview(fastify, employee, body) {
|
||||
async function resolveWorkingDaysPreview(fastify, employee, body, options = {}) {
|
||||
const allowNonWorkingRange = Boolean(options.allowNonWorkingRange);
|
||||
|
||||
if (!employee?.legal_entity_id) {
|
||||
return buildNaturalWorkingDaysPreview(body);
|
||||
}
|
||||
@@ -288,11 +291,14 @@ async function resolveWorkingDaysPreview(fastify, employee, body) {
|
||||
startSession: body.startSession,
|
||||
endSession: body.endSession,
|
||||
calendarDays: calendar.days,
|
||||
allowNonWorkingRange,
|
||||
});
|
||||
}
|
||||
|
||||
async function resolveRequestedDaysForCreate(fastify, employee, body) {
|
||||
const preview = await resolveWorkingDaysPreview(fastify, employee, body);
|
||||
const preview = await resolveWorkingDaysPreview(fastify, employee, body, {
|
||||
allowNonWorkingRange: false,
|
||||
});
|
||||
return preview.requestedDays;
|
||||
}
|
||||
|
||||
@@ -579,7 +585,9 @@ async function leaveRoutes(fastify) {
|
||||
},
|
||||
async (request, reply) => {
|
||||
const query = parseWorkingDaysPreviewQuery(request.query);
|
||||
const preview = await resolveWorkingDaysPreview(fastify, request.employee, query);
|
||||
const preview = await resolveWorkingDaysPreview(fastify, request.employee, query, {
|
||||
allowNonWorkingRange: true,
|
||||
});
|
||||
|
||||
return sendData(reply, request, preview);
|
||||
},
|
||||
|
||||
+15
-1
@@ -140,6 +140,7 @@ function calculateRequestedDaysPreviewByWorkingCalendar({
|
||||
startSession,
|
||||
endSession,
|
||||
calendarDays = [],
|
||||
allowNonWorkingRange = false,
|
||||
}) {
|
||||
const naturalRequestedDays = calculateRequestedDays({
|
||||
startDate,
|
||||
@@ -184,7 +185,19 @@ function calculateRequestedDaysPreviewByWorkingCalendar({
|
||||
}
|
||||
|
||||
if (requestedUnits <= 0) {
|
||||
throw buildLeaveValidationError({ leave: "non_working_range" });
|
||||
if (!allowNonWorkingRange) {
|
||||
throw buildLeaveValidationError({ leave: "non_working_range" });
|
||||
}
|
||||
|
||||
return {
|
||||
requestedDays: 0,
|
||||
naturalRequestedDays,
|
||||
holidayDayCount: fromHalfDayUnits(holidayUnits),
|
||||
weekendDayCount: fromHalfDayUnits(weekendUnits),
|
||||
adjustedWorkdayCount: fromHalfDayUnits(adjustedWorkdayUnits),
|
||||
calendarApplied: true,
|
||||
isNonWorkingRange: true,
|
||||
};
|
||||
}
|
||||
|
||||
return {
|
||||
@@ -194,6 +207,7 @@ function calculateRequestedDaysPreviewByWorkingCalendar({
|
||||
weekendDayCount: fromHalfDayUnits(weekendUnits),
|
||||
adjustedWorkdayCount: fromHalfDayUnits(adjustedWorkdayUnits),
|
||||
calendarApplied: true,
|
||||
isNonWorkingRange: false,
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -136,6 +136,7 @@ describe("leave working-days route", () => {
|
||||
weekendDayCount: 0,
|
||||
adjustedWorkdayCount: 1,
|
||||
calendarApplied: true,
|
||||
isNonWorkingRange: false,
|
||||
});
|
||||
|
||||
await app.close();
|
||||
@@ -158,6 +159,44 @@ describe("leave working-days route", () => {
|
||||
weekendDayCount: 0,
|
||||
adjustedWorkdayCount: 0.5,
|
||||
calendarApplied: true,
|
||||
isNonWorkingRange: false,
|
||||
});
|
||||
|
||||
await app.close();
|
||||
});
|
||||
|
||||
it("returns zero days instead of error for fully non-working preview ranges", async () => {
|
||||
const { app } = await buildApp({
|
||||
legalEntity: buildLegalEntity({
|
||||
default_holiday_calendar: {
|
||||
id: "calendar-1",
|
||||
archived_at: null,
|
||||
days: [
|
||||
buildCalendarDay("2026-05-01", "holiday"),
|
||||
buildCalendarDay("2026-05-02", "holiday"),
|
||||
buildCalendarDay("2026-05-03", "holiday"),
|
||||
buildCalendarDay("2026-05-04", "holiday"),
|
||||
buildCalendarDay("2026-05-05", "holiday"),
|
||||
],
|
||||
},
|
||||
}),
|
||||
});
|
||||
|
||||
const response = await app.inject({
|
||||
method: "GET",
|
||||
url: "/api/leave-requests/working-days?startDate=2026-05-01&endDate=2026-05-05&startSession=am&endSession=pm",
|
||||
headers: { authorization: "Bearer test" },
|
||||
});
|
||||
|
||||
expect(response.statusCode).toBe(200);
|
||||
expect(response.json().data).toEqual({
|
||||
requestedDays: 0,
|
||||
naturalRequestedDays: 5,
|
||||
holidayDayCount: 5,
|
||||
weekendDayCount: 0,
|
||||
adjustedWorkdayCount: 0,
|
||||
calendarApplied: true,
|
||||
isNonWorkingRange: true,
|
||||
});
|
||||
|
||||
await app.close();
|
||||
@@ -182,6 +221,7 @@ describe("leave working-days route", () => {
|
||||
weekendDayCount: 0,
|
||||
adjustedWorkdayCount: 0,
|
||||
calendarApplied: false,
|
||||
isNonWorkingRange: false,
|
||||
});
|
||||
expect(featureFlagFindUnique).not.toHaveBeenCalled();
|
||||
expect(legalEntityFindUnique).not.toHaveBeenCalled();
|
||||
|
||||
@@ -121,6 +121,7 @@ describe("Leave Service", () => {
|
||||
weekendDayCount: 0,
|
||||
adjustedWorkdayCount: 1,
|
||||
calendarApplied: true,
|
||||
isNonWorkingRange: false,
|
||||
});
|
||||
});
|
||||
|
||||
@@ -143,6 +144,34 @@ describe("Leave Service", () => {
|
||||
weekendDayCount: 0,
|
||||
adjustedWorkdayCount: 0.5,
|
||||
calendarApplied: true,
|
||||
isNonWorkingRange: false,
|
||||
});
|
||||
});
|
||||
|
||||
it("returns zero-day preview for fully non-working ranges when explicitly allowed", () => {
|
||||
expect(
|
||||
calculateRequestedDaysPreviewByWorkingCalendar({
|
||||
startDate: "2026-05-01",
|
||||
endDate: "2026-05-05",
|
||||
startSession: "am",
|
||||
endSession: "pm",
|
||||
allowNonWorkingRange: true,
|
||||
calendarDays: [
|
||||
{ date: "2026-05-01", day_type: "holiday" },
|
||||
{ date: "2026-05-02", day_type: "holiday" },
|
||||
{ date: "2026-05-03", day_type: "holiday" },
|
||||
{ date: "2026-05-04", day_type: "holiday" },
|
||||
{ date: "2026-05-05", day_type: "holiday" },
|
||||
],
|
||||
}),
|
||||
).toEqual({
|
||||
requestedDays: 0,
|
||||
naturalRequestedDays: 5,
|
||||
holidayDayCount: 5,
|
||||
weekendDayCount: 0,
|
||||
adjustedWorkdayCount: 0,
|
||||
calendarApplied: true,
|
||||
isNonWorkingRange: true,
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
在新工单中引用
屏蔽一个用户