 钱涛
|
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 |
|
钱涛
|
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 |
|
钱涛
|
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 |
|
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 |
|
钱涛
|
d23baeb940
|
支持Vlookup
|
2024-08-16 12:19:18 +08:00 |
|
钱涛
|
673699dfb8
|
导入工具明细
|
2024-08-16 11:18:27 +08:00 |
|
Harryxzy
|
be6e7bb787
|
工资明细导出excel单元格格式
|
2024-08-16 11:08:57 +08:00 |
|
钱涛
|
7250ed3520
|
修复组织信息快照，主动添加或者sql添加人员丢失
|
2024-08-15 17:03:17 +08:00 |
|
钱涛
|
980dc2f532
|
导入工具
|
2024-08-15 16:25:31 +08:00 |
|
Harryxzy
|
a4d91c3c97
|
删除无用代码
|
2024-08-15 16:01:00 +08:00 |
|
Harryxzy
|
2ee605df44
|
浮动薪酬优化
|
2024-08-15 13:56:41 +08:00 |
|
钱涛
|
c079b1d2e6
|
Merge branch 'release/2.15.1.2407.01' into feature/导入工具
|
2024-08-15 13:48:14 +08:00 |
|
钱涛
|
22ccad05ad
|
排除显示
|
2024-08-15 13:47:55 +08:00 |
|
钱涛
|
5071c08d8c
|
Merge branch 'release/2.15.1.2407.01' into feature/导入工具
# Conflicts:
# src/com/engine/salary/service/impl/SalarySobServiceImpl.java
|
2024-08-15 13:41:52 +08:00 |
|
钱涛
|
c5c469e4c4
|
修复邮件不显示入职日期
|
2024-08-15 11:54:18 +08:00 |
|
Harryxzy
|
e9fef7d915
|
Merge remote-tracking branch 'origin/release/2.15.1.2407.01' into release/2.15.1.2407.01
|
2024-08-15 11:10:49 +08:00 |
|
Harryxzy
|
4348954994
|
Merge branch 'feature/240801-报表义务人、账套分权' into release/2.15.1.2407.01
|
2024-08-15 11:09:09 +08:00 |
|
钱涛
|
2b2e9ea504
|
账套支持sql范围
|
2024-08-15 10:53:08 +08:00 |
|
钱涛
|
d37434521d
|
Merge remote-tracking branch 'origin/release/2.15.1.2407.01' into release/2.15.1.2407.01
|
2024-08-15 10:37:57 +08:00 |
|
钱涛
|
f74ec99644
|
账套支持sql范围
|
2024-08-15 10:37:41 +08:00 |
|
钱涛
|
6450254371
|
薪酬迁移工具
|
2024-08-14 14:47:27 +08:00 |
|
Harryxzy
|
832a6ac1ec
|
社保福利台账明细导入2100bug
|
2024-08-14 11:17:56 +08:00 |
|
Harryxzy
|
89e3f54dc2
|
宁波精华7天内离职人员二开
|
2024-08-14 10:49:18 +08:00 |
|
钱涛
|
9d26e1228f
|
薪酬迁移工具
|
2024-08-13 18:15:04 +08:00 |
|
Harryxzy
|
c255d74912
|
批量导入 分页
|
2024-08-13 15:25:57 +08:00 |
|
Harryxzy
|
a05fb6fcf0
|
报表义务人、账套分权
|
2024-08-13 13:45:24 +08:00 |
|
Harryxzy
|
2e7657eb23
|
浮动薪酬增加义务人
|
2024-08-12 17:21:11 +08:00 |
|
钱涛
|
845f117d9c
|
excel导入工具
|
2024-08-12 17:17:52 +08:00 |
|
Harryxzy
|
a0dff5780a
|
浮动薪酬增加义务人sql
|
2024-08-12 17:11:17 +08:00 |
|
Harryxzy
|
5055a4801a
|
浮动薪酬增加义务人
|
2024-08-12 16:36:27 +08:00 |
|
钱涛
|
ecb0f6f7bc
|
excel导入工具
|
2024-08-12 15:16:06 +08:00 |
|
钱涛
|
b83d45efa0
|
下载系统配置
|
2024-08-12 10:02:46 +08:00 |
|
钱涛
|
31cd3981e2
|
添加日志
|
2024-08-09 17:30:44 +08:00 |
|
钱涛
|
71c9bd3564
|
xml文件
|
2024-08-09 15:53:36 +08:00 |
|
Harryxzy
|
75fb15928a
|
浮动薪酬
|
2024-08-09 10:21:40 +08:00 |
|
钱涛
|
dd257ec53e
|
xml文件
|
2024-08-09 09:22:27 +08:00 |
|
钱涛
|
6532225da3
|
迁移工具
|
2024-08-08 18:04:50 +08:00 |
|
钱涛
|
83a408afa2
|
迁移工具
|
2024-08-08 16:53:31 +08:00 |
|
钱涛
|
8611358c6c
|
配置
|
2024-08-08 11:03:55 +08:00 |
|
钱涛
|
080a69c929
|
全量迁移
|
2024-08-08 09:50:04 +08:00 |
|
钱涛
|
484639a690
|
导入薪资项目、模板、预览
|
2024-08-07 14:40:08 +08:00 |
|
钱涛
|
d30380e2e7
|
导入薪资项目、模板、预览
|
2024-08-07 14:23:35 +08:00 |
|
钱涛
|
b8b9cbbe6c
|
导入薪资项目
|
2024-08-07 13:25:57 +08:00 |
|
Harryxzy
|
a58bb7c189
|
宁波精华 - 全部薪资档案
|
2024-08-07 11:34:40 +08:00 |
|
钱涛
|
48120f8e24
|
导入薪资项目
|
2024-08-07 09:06:09 +08:00 |
|
Harryxzy
|
c44187b336
|
宁波精华 temp
|
2024-08-06 17:33:00 +08:00 |
|
Harryxzy
|
dd18cf5191
|
考勤引用多个账套
|
2024-08-06 16:54:19 +08:00 |
|
钱涛
|
bd6e30b63b
|
导入薪资项目
|
2024-08-06 14:24:08 +08:00 |
|
钱涛
|
10d988084b
|
导入工具
|
2024-08-06 10:32:57 +08:00 |
|
钱涛
|
ff00de206c
|
线下对比
|
2024-08-05 17:23:25 +08:00 |
|
Harryxzy
|
8d057e2706
|
Merge branch 'feature/240702-编辑核算时人员信息' into release/2.15.1.2407.01
|
2024-08-01 10:53:29 +08:00 |
|
Harryxzy
|
8bbf8f3ff6
|
核算时编辑职称bug
|
2024-08-01 10:52:44 +08:00 |
|
钱涛
|
241a85c711
|
默认值
|
2024-07-31 14:59:03 +08:00 |
|
Harryxzy
|
bcf5fbdce7
|
Merge branch 'fix/240702-社保福利档案导入下载模板bug' into release/2.15.1.2407.01
|
2024-07-30 18:17:49 +08:00 |
|
Harryxzy
|
0c3610961f
|
修复社保福利档案 高级搜索后下载导入模板bug
|
2024-07-30 17:29:12 +08:00 |
|
Harryxzy
|
9819bb25e0
|
修复社保福利台账补差添加bug
|
2024-07-29 10:58:41 +08:00 |
|
Harryxzy
|
ec669c1f51
|
核算时编辑人员组织信息
|
2024-07-25 17:51:38 +08:00 |
|
Harryxzy
|
bdd27bcfc6
|
核算时编辑人员组织信息
|
2024-07-25 14:04:14 +08:00 |
|
Harryxzy
|
671350654a
|
fix薪资明细报表显示列定制
|
2024-07-22 15:29:34 +08:00 |
|
Harryxzy
|
8b0781ef31
|
删除无用代码
|
2024-07-22 11:28:51 +08:00 |