Commit Graph

420 Commits

Author SHA1 Message Date
a871bb3f96 Merge pull request 'fix: 修正档案报告品牌名 工学云 → 恭学教育' (#25) from fix/brand-name into main 2026-07-20 04:00:17 +00:00
ed428c8aa3 fix: 修正档案报告品牌名 工学云 → 恭学教育 2026-07-20 11:59:51 +08:00
62a5f817ae Merge pull request 'feat: 拆分学号/身份证字段 + 考勤教师展示 + 代码优化' (#24) from feat/split-student-id-number into main 2026-07-20 03:54:21 +00:00
c7ba2799b9 feat: 拆分学号/身份证字段 + 考勤教师展示 + 代码优化
- 入住导入模板:学号和身份证号拆为独立字段,前后端对齐
- 排课查询关联教师,考勤归档页展示教师姓名
- 抽查时段增加 IsIn 校验
- 抽取 withPessimisticWriteLock 去重悲观锁查询
- import 增加文件空 buffer 校验
- 测试 mock 补全,适配事务 manager
- MySQL init.sql VALUES() 语法兼容修复
2026-07-20 11:54:01 +08:00
375c7ec60b feat: refine admin forms, attendance and finance workflows
Squash merge PR #23.

Included changes:
- complete occupancy check-in required fields/default payload
- improve responsive admin management pages
- fix attendance edge cases and attendance period config
- refine wallet/finance-related workflow handling

Checks:
- npm run typecheck -w apps/admin
- npm run typecheck -w apps/server
2026-07-18 12:54:10 +00:00
92d303ed01 Merge pull request #22: financial safety and attendance workspace 2026-07-18 07:35:49 +00:00
295debee33 Merge teacher attendance workspace 2026-07-18 15:34:36 +08:00
a8da6de235 Merge financial safety fixes 2026-07-18 15:34:36 +08:00
98d335b889 feat: redesign teacher attendance workspace 2026-07-18 15:34:02 +08:00
5836b421d8 fix: harden financial transaction boundaries 2026-07-18 15:33:41 +08:00
4af7acbeaa Merge pull request #21: harden DingTalk student synchronization 2026-07-18 06:52:33 +00:00
c11f6bb614 fix: harden DingTalk student synchronization 2026-07-18 14:51:53 +08:00
d25e451b61 Merge pull request #20: refine deposit workflows and RBAC permissions 2026-07-18 06:07:19 +00:00
7edb4ff853 fix: prune unused RBAC permissions 2026-07-17 17:43:45 +08:00
b3d0bafc22 feat: refine deposit room type workflows 2026-07-17 17:36:04 +08:00
a5bda6f093 Merge pull request 'fix: 归档删除改为软删除' (#19)
fix: 归档删除改为软删除
2026-07-17 06:18:38 +00:00
f7328d670d fix: 归档删除改为软删除 2026-07-17 14:13:17 +08:00
3131d2e141 Merge pull request 'fix:修复无法导出账单pdf' (#18) 2026-07-16 03:47:38 +00:00
2beedc22af fix:修复无法导出账单pdf 2026-07-16 11:25:59 +08:00
fa086e4c1c Merge pull request '修复考勤服务测试 mock' (#17) 2026-07-16 03:01:59 +00:00
4fbcde48b1 test: update attendance service mocks 2026-07-16 11:01:24 +08:00
c93ac986aa Merge pull request '移除删除账号功能' (#15) 2026-07-16 02:55:22 +00:00
ab7f7c725a Merge pull request '添加考勤设备 SN 教室绑定' (#16) 2026-07-16 02:49:30 +00:00
200d2e423b 调整归档操作入口 2026-07-16 10:44:21 +08:00
559b8a56e9 feat: add attendance device SN classroom bindings 2026-07-16 10:22:23 +08:00
d037787346 feat: support batch wallet balance changes 2026-07-16 10:22:23 +08:00
8ba51f48c0 fix: map expense type sort order column 2026-07-16 10:22:23 +08:00
7a62d8962a chore: update production deployment config 2026-07-16 10:21:40 +08:00
1737563516 移除删除账号功能 2026-07-16 10:16:56 +08:00
6a43f33f7a Merge pull request '优化管理端移动端适配与班级教师候选人' (#14)
Merge PR #14
2026-07-15 05:57:32 +00:00
d582d641c0 feat: improve admin responsive pages and teacher candidates 2026-07-15 13:56:58 +08:00
fb9697bd05 Merge pull request '完善全业务边界校验与回归测试' (#12)
Merge PR #12
2026-07-15 05:53:46 +00:00
bc49d1016a feat: filter rooms by rental category 2026-07-15 13:52:39 +08:00
8bd445df5a fix student import and profile labels 2026-07-15 10:52:43 +08:00
fcde6caaaa fix: defer attendance settlement until lesson end 2026-07-15 09:39:21 +08:00
b1f35f9d1a test: harden business boundary conditions 2026-07-15 00:03:55 +08:00
17a5046ea0 Merge pull request '完善考勤排课与接口校验' (#11) from wangziqi/gongxue-base:codex/wzq into main
完善考勤排课、钉钉同步与接口参数校验
2026-07-14 15:13:12 +00:00
e45da7f998 feat: improve attendance scheduling and API validation 2026-07-14 23:12:14 +08:00
c75a08affe feat: add student wallet utility billing 2026-07-14 20:42:21 +08:00
b480070e69 Merge pull request '修复账单生成时未计算分摊费用' (#10) from xiongyuxing/gongxue-base:main into main
Reviewed-on: wangziqi/gongxue-base#10
2026-07-14 08:41:13 +00:00
598b4e8acd feat: link deposits to bill payment 2026-07-14 16:38:38 +08:00
eac336a54a fix: include contained room expenses in bill generation 2026-07-14 14:53:07 +08:00
ce5fd1c6cb fix: 修复批量更新账单状态功能 2026-07-14 14:24:19 +08:00
05a936bbc2 Merge pull request 'feat: 优化入住办理与名单导入' (#9) from codex/wzq into main 2026-07-14 04:26:53 +00:00
3adf4933d8 Merge pull request '修复pdf导出' (#8) from xiongyuxing/gongxue-base:main into main 2026-07-14 04:26:34 +00:00
d84f37e98f feat: streamline occupancy check-in and imports 2026-07-14 12:23:53 +08:00
16b56ffcd5 merge upstream 2026-07-14 04:09:42 +00:00
718c58589f Merge PR #7: improve attendance and occupancy workflows 2026-07-14 03:22:19 +00:00
aaf49d5580 fix: guard bill generation submission 2026-07-14 11:20:42 +08:00
5cf6aede1e feat: improve occupancy import template 2026-07-14 11:20:41 +08:00