Commit Graph

3109 Commits

Author SHA1 Message Date
钱涛 17ef5a3c2b 浮动数据菜单 2024-09-24 13:19:20 +08:00
钱涛 164a97a8e0 修复大数据量,重新核算报错 2024-09-23 11:10:25 +08:00
钱涛 dc3dfc2d6b 去除脱敏报表 2024-09-20 11:41:44 +08:00
Harryxzy 2b7b61745a Merge branch 'feature/240801-浮动薪资' into release/2.15.2.2409.01 2024-09-19 17:50:09 +08:00
钱涛 db064863b2 版本号 2024-09-19 14:19:26 +08:00
钱涛 91863b901f 增加核算日志 2024-09-19 14:17:47 +08:00
钱涛 a59448e454 修复人力资源删除数据影响列表展示 2024-09-18 18:24:08 +08:00
Harryxzy 18ab255678 Merge branch 'fix/240901_社保福利档案补缴添加bug' into release/2.15.2.2409.01 2024-09-18 16:47:19 +08:00
Harryxzy 58012fe1e1 修复社保福利档案补缴添加bug 2024-09-18 16:44:02 +08:00
钱涛 cbd6553e11 Merge remote-tracking branch 'origin/release/2.15.2.2409.01' into release/2.15.2.2409.01 2024-09-18 15:59:45 +08:00
钱涛 09042321d1 1、支持获取班次信息
2、导出考勤功能优化,excel列和列表显示保持一致
2024-09-18 15:59:36 +08:00
Harryxzy c4826515e1 Merge branch 'fix/240802-报表数据透视bug' into feature/240901-报表增加岗位筛选 2024-09-14 15:33:58 +08:00
Harryxzy eefd4d1795 报表增加岗位筛选 2024-09-14 15:33:31 +08:00
Harryxzy 31d2994a9a 浮动薪酬多语言 2024-09-14 10:30:32 +08:00
Harryxzy c212a2782f 薪酬统计报表增加岗位筛选 2024-09-13 14:54:52 +08:00
Harryxzy 9e5810f173 Merge branch 'feature/240801-浮动薪资' into release/2.15.2.2409.01 2024-09-13 11:11:24 +08:00
钱涛 d70e63e787 修复工资单保存异常 2024-09-12 17:07:52 +08:00
钱涛 3d21fd250f 工资单支持文本变量 2024-09-12 16:22:32 +08:00
钱涛 8aa34b806c 日志权限 2024-09-12 14:50:10 +08:00
钱涛 54f9c8f056 增加账套配置接口级锁 2024-09-11 16:15:02 +08:00
钱涛 7393d96259 增加账套配置接口级锁 2024-09-11 16:13:49 +08:00
钱涛 882716b10c 修复核算结果可能为空带来的影响 2024-09-05 14:13:43 +08:00
Harryxzy 0d5b1c37fd Merge remote-tracking branch 'origin/release/2.15.1.2407.01' into release/2.15.1.2407.01 2024-09-03 09:24:22 +08:00
Harryxzy 44c11c7dcc Merge branch 'feature/240801-社保方案上下限调整自动调整基数' into release/2.15.1.2407.01 2024-09-03 09:23:50 +08:00
钱涛 fa861c71dc 支持自定义单个线程处理人员数量 2024-09-02 18:11:00 +08:00
钱涛 ce1a82b6e7 Merge remote-tracking branch 'origin/release/2.15.1.2407.01' into release/2.15.1.2407.01 2024-09-02 18:10:39 +08:00
钱涛 b7f9a1653c 线程数量 2024-09-02 17:41:07 +08:00
Harryxzy fedaf50187 返聘优化 2024-09-02 14:45:03 +08:00
钱涛 05a9b9e9b2 修改批量插入大小 2024-08-30 17:23:36 +08:00
Harryxzy e3200f7932 fix报表数据透视 bug 2024-08-30 13:35:17 +08:00
Harryxzy eb5cf04622 fix 2024-08-28 11:02:46 +08:00
钱涛 42e91e32da 改为通过快照信息搜索 2024-08-26 09:26:42 +08:00
Harryxzy 59820f6aca Merge branch 'fix/240801-核算导入支持vlookup' into release/2.15.1.2407.01 2024-08-20 14:03:58 +08:00
Harryxzy 2a58b4972b 薪资核算导入支持vlookup函数 2024-08-20 13:48:31 +08:00
钱涛 9fae93fcd7 Merge branch 'feature/导入工具' into release/2.15.1.2407.01 2024-08-20 11:40:33 +08:00
钱涛 9121268815 修复重新导入账套bug 2024-08-20 09:29:14 +08:00
Harryxzy 984e544503 社保方案上下限自动调整基数 2024-08-19 16:27:56 +08:00
Harryxzy 6dc9650305 Merge branch 'release/2.15.1.2407.01' into feature/240801-社保方案上下限调整自动调整基数 2024-08-19 16:01:06 +08:00
Harryxzy 26d300299b 社保方案上下限 2024-08-19 12:07:03 +08:00
钱涛 cd8d4601af 全量迁移配置 2024-08-19 09:49:49 +08:00
Harryxzy 8742ee7857 Merge branch 'fix/240801-工资明细导出excel单元格格式' into release/2.15.1.2407.01 2024-08-16 15:27:15 +08:00
钱涛 105129165d Merge branch 'release/2.15.1.2407.01' into feature/240801-浮动薪资 2024-08-16 14:40:02 +08:00
钱涛 22c99e081d 支持Vlookup 2024-08-16 14:39:01 +08:00
钱涛 10b8be86d1 Merge branch 'release/2.15.1.2407.01' into feature/240801-浮动薪资 2024-08-16 14:14:30 +08:00
钱涛 4b9341cc98 支持Vlookup 2024-08-16 14:13:59 +08:00
钱涛 94d068356b Merge branch 'release/2.15.1.2407.01' into feature/240801-浮动薪资 2024-08-16 14:07:56 +08:00
钱涛 4b30292c6c 支持Vlookup 2024-08-16 14:07:16 +08:00
钱涛 e2b2b9071f Merge remote-tracking branch 'origin/feature/240801-浮动薪资' into feature/240801-浮动薪资 2024-08-16 14:04:31 +08:00
钱涛 1d388a1993 支持Vlookup 2024-08-16 14:04:20 +08:00
钱涛 659560550a Merge branch 'release/2.15.1.2407.01' into feature/240801-浮动薪资 2024-08-16 13:18:08 +08:00