 钱涛
|
9d26e1228f
|
薪酬迁移工具
|
2024-08-13 18:15:04 +08:00 |
Harryxzy
|
a05fb6fcf0
|
报表义务人、账套分权
|
2024-08-13 13:45:24 +08:00 |
|
钱涛
|
845f117d9c
|
excel导入工具
|
2024-08-12 17:17:52 +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 |
|
钱涛
|
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 |
|
钱涛
|
e0271c3006
|
成员和数据批量保存
|
2024-08-08 10:01:41 +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 |
|
钱涛
|
48120f8e24
|
导入薪资项目
|
2024-08-07 09:06:09 +08:00 |
|
Harryxzy
|
dd18cf5191
|
考勤引用多个账套
|
2024-08-06 16:54:19 +08:00 |
|
钱涛
|
bd6e30b63b
|
导入薪资项目
|
2024-08-06 14:24:08 +08:00 |
|
钱涛
|
23ed2c5f3f
|
删除、同步对象设置
|
2024-08-06 10:46:33 +08:00 |
|
钱涛
|
10d988084b
|
导入工具
|
2024-08-06 10:32:57 +08:00 |
|
钱涛
|
84cb57ccd7
|
Merge branch 'release/2.15.1.2407.01' into feature/权限
|
2024-08-05 17:23:47 +08:00 |
|
钱涛
|
ff00de206c
|
线下对比
|
2024-08-05 17:23:25 +08:00 |
|
钱涛
|
4dcb3b4fea
|
薪资档案分权
|
2024-08-05 15:40:34 +08:00 |
|
钱涛
|
4d8c54bf8a
|
角色加描述
|
2024-08-02 16:18:26 +08:00 |
|
钱涛
|
494679087d
|
角色加描述
|
2024-08-02 14:04:14 +08:00 |
|
钱涛
|
9eea989bf2
|
显示扣缴义务人的角色
|
2024-08-02 10:10:04 +08:00 |
|
钱涛
|
4d51b6e57c
|
显示扣缴义务人的角色
|
2024-08-01 18:04:09 +08:00 |
|
钱涛
|
a0d2db2702
|
角色
|
2024-08-01 16:19:23 +08:00 |
|
钱涛
|
c674c22da1
|
在线算税重试处理
|
2024-08-01 10:56:29 +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 |
|
钱涛
|
a8b487c94b
|
Merge branch 'release/2.15.1.2407.01' into feature/权限
# Conflicts:
# src/com/engine/salary/mapper/datacollection/EmployMapper.java
# src/com/engine/salary/mapper/datacollection/EmployMapper.xml
# src/com/engine/salary/service/SalaryEmployeeService.java
# src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
|
2024-08-01 10:16:05 +08:00 |
|
钱涛
|
241a85c711
|
默认值
|
2024-07-31 14:59:03 +08:00 |
|
钱涛
|
6f55def466
|
权限数据
|
2024-07-30 18:55:02 +08:00 |
|
Harryxzy
|
bcf5fbdce7
|
Merge branch 'fix/240702-社保福利档案导入下载模板bug' into release/2.15.1.2407.01
|
2024-07-30 18:17:49 +08:00 |
|
钱涛
|
87a5eb59c6
|
暂存
|
2024-07-30 17:45:02 +08:00 |
|
Harryxzy
|
0c3610961f
|
修复社保福利档案 高级搜索后下载导入模板bug
|
2024-07-30 17:29:12 +08:00 |
|
钱涛
|
fad1402b06
|
权限项配置
|
2024-07-29 16:00:27 +08:00 |
|
钱涛
|
63012fd62a
|
成员列表
|
2024-07-29 13:28:46 +08:00 |
|
Harryxzy
|
9819bb25e0
|
修复社保福利台账补差添加bug
|
2024-07-29 10:58:41 +08:00 |
|
钱涛
|
a976dbc9c5
|
成员同步
|
2024-07-29 09:46:01 +08:00 |
|
钱涛
|
76543c6021
|
成员同步
|
2024-07-26 16:35:51 +08:00 |
|
钱涛
|
0b091eee12
|
成员表达式变更
|
2024-07-26 14:32:35 +08:00 |
|
钱涛
|
e30ae5a2a1
|
成员表达式变更
|
2024-07-26 14:30:14 +08:00 |
|
钱涛
|
4543539206
|
角色和成员基础接口
|
2024-07-26 11:35:17 +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
|
039c6fd568
|
薪资明细报表合计行过滤文本项
|
2024-07-22 10:27:46 +08:00 |
|
钱涛
|
909152decc
|
报表导出改为从内存获取
|
2024-07-16 16:57:58 +08:00 |
|
Harryxzy
|
6f7ae2506d
|
阅后即焚oracle数据库修复
|
2024-07-16 14:56:11 +08:00 |
|
Harryxzy
|
78cdadbb99
|
工资单详情 - 显示列定制
|
2024-07-16 11:30:25 +08:00 |
|
Harryxzy
|
95ba4aee36
|
Merge branch 'fix/240701_返聘action优化' into release/2.15.1.2407.01
|
2024-07-15 14:48:21 +08:00 |
|
Harryxzy
|
5331494ebc
|
Merge branch 'fix/240701_报表分页' into release/2.15.1.2407.01
|
2024-07-15 14:48:08 +08:00 |
|
Harryxzy
|
e579bbc4f2
|
人员维度分页
|
2024-07-15 11:20:24 +08:00 |
|
钱涛
|
50e3be607d
|
修复oracle bug
|
2024-07-11 16:30:00 +08:00 |
|
Harryxzy
|
a259a52044
|
人员维度分页
|
2024-07-11 11:28:54 +08:00 |
|
Harryxzy
|
a6f02082d8
|
fix社保福利台账非系统人员日志空指针
|
2024-07-10 15:01:49 +08:00 |
|
Harryxzy
|
84ce2821f6
|
1、定薪、返聘action优化
2、修复导出时excel中双击单元格变成黑色
|
2024-07-10 14:01:09 +08:00 |
|
钱涛
|
7ef229dfde
|
修复社保调差bug
|
2024-07-10 10:43:11 +08:00 |
|
Harryxzy
|
95b9f5452a
|
薪资档案导出fix多选义务人bug
|
2024-07-08 10:20:21 +08:00 |
|
Harryxzy
|
3a7c1c2d29
|
修复sql隐藏bug
|
2024-07-03 18:00:29 +08:00 |
|
Harryxzy
|
db93c2b8a8
|
修复报表分享记录分页总计数bug
|
2024-06-28 17:22:34 +08:00 |
|
钱涛
|
458f10d09b
|
优化考勤引用
|
2024-06-28 15:42:10 +08:00 |
|
钱涛
|
edddf5f557
|
处理8位小数问题
|
2024-06-28 14:42:23 +08:00 |
|
钱涛
|
9c7c6de614
|
核算信息快照
|
2024-06-27 16:10:30 +08:00 |
|
钱涛
|
ea07fe1a59
|
处理sqlserver 2100 个参数
|
2024-06-27 10:38:30 +08:00 |
|
Harryxzy
|
b26663889d
|
Merge branch 'fix/240603_薪资明细导出排序' into release/2.14.5.2406.03
|
2024-06-26 11:33:32 +08:00 |
|
Harryxzy
|
933fc8ae65
|
报表分享支持次账号
|
2024-06-26 11:33:12 +08:00 |
|
Harryxzy
|
c1c8bae9da
|
Merge branch 'fix/240603_薪资明细导出排序' into release/2.14.5.2406.03
|
2024-06-26 10:37:51 +08:00 |
|
Harryxzy
|
63c7477966
|
1、薪资明细导出根据显示列定制导出
2、薪资档案 高级搜索支持个税扣缴义务人多选
|
2024-06-26 10:35:05 +08:00 |
|
钱涛
|
993f21b448
|
Merge branch 'feature/人员信息快照' into release/2.14.5.2406.03
# Conflicts:
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
|
2024-06-21 14:17:36 +08:00 |
|
钱涛
|
a90e32fbf4
|
map映射
|
2024-06-20 17:08:01 +08:00 |
|
Harryxzy
|
071130adb3
|
Merge remote-tracking branch 'origin/release/2.14.4.2406.02' into release/2.14.4.2406.02
|
2024-06-20 16:40:42 +08:00 |
|
Harryxzy
|
b5f8e88a58
|
Merge branch 'feature/240502_薪资项目增加默认值设置' into release/2.14.4.2406.02
|
2024-06-20 16:40:07 +08:00 |
|
Harryxzy
|
537992187e
|
update 设置了多个default_value
|
2024-06-20 16:39:48 +08:00 |
|
钱涛
|
2be7ec31de
|
修改工资单预览
|
2024-06-20 16:39:35 +08:00 |
|
Harryxzy
|
560fabe075
|
账套人员范围导入增加了一列，导致导入校验没通过
|
2024-06-20 16:28:48 +08:00 |
|
钱涛
|
e5d66373e6
|
默认值需要导致异动
|
2024-06-20 14:47:19 +08:00 |
|
Harryxzy
|
3f9bb23e80
|
Merge branch 'feature/240502_薪资项目增加默认值设置' into release/2.14.4.2406.02
|
2024-06-20 11:44:15 +08:00 |
|
Harryxzy
|
e13c2b0cd0
|
薪资项目同步默认值
|
2024-06-20 11:43:57 +08:00 |
|
Harryxzy
|
4fbd7d7418
|
Merge branch 'feature/240502_薪资项目增加默认值设置' into release/2.14.4.2406.02
|
2024-06-20 10:44:41 +08:00 |
|
Harryxzy
|
5459729da2
|
Merge branch 'feature/240301-导出excel单元格格式' into release/2.14.4.2406.02
# Conflicts:
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
|
2024-06-20 10:44:12 +08:00 |
|
钱涛
|
0961071980
|
Merge remote-tracking branch 'origin/feature/240502_薪资项目增加默认值设置' into feature/240502_薪资项目增加默认值设置
# Conflicts:
# src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml
|
2024-06-19 11:23:43 +08:00 |
|
钱涛
|
fe8dcd0ccd
|
核算默认值
|
2024-06-19 11:21:00 +08:00 |
|
钱涛
|
f0fce26e8a
|
Merge branch 'release/2.14.4.2406.02' into feature/240502_薪资项目增加默认值设置
# Conflicts:
# src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml
# src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
|
2024-06-19 11:14:31 +08:00 |
|
钱涛
|
81c768b7b9
|
人员信息快照
|
2024-06-18 15:28:31 +08:00 |
|
钱涛
|
0c0c754a9d
|
人员信息快照
|
2024-06-18 11:01:58 +08:00 |
|
Harryxzy
|
216c4cee84
|
默认值temp
|
2024-06-17 17:58:01 +08:00 |
|
钱涛
|
5b7533e908
|
同步假期余额字段
|
2024-06-14 13:46:59 +08:00 |
|
钱涛
|
5c13f80034
|
Merge remote-tracking branch 'origin/release/2.14.4.2406.02' into release/2.14.4.2406.02
|
2024-06-13 17:46:55 +08:00 |
|
钱涛
|
64e34d6d08
|
工资单预览
|
2024-06-13 17:46:37 +08:00 |
|
Harryxzy
|
a27716ae72
|
Merge remote-tracking branch 'origin/release/2.14.4.2406.02' into release/2.14.4.2406.02
|
2024-06-13 14:14:38 +08:00 |
|
Harryxzy
|
6513c2b6e6
|
Merge branch 'fix/240601-补差导入模板bug' into release/2.14.4.2406.02
|
2024-06-13 14:14:21 +08:00 |
|
Harryxzy
|
1dd3439ce3
|
社保福利台账小数位优化
|
2024-06-13 13:59:43 +08:00 |
|
钱涛
|
db391f01c4
|
处理大数据内存溢出
|
2024-06-13 13:39:24 +08:00 |
|
钱涛
|
4798f5d4a6
|
处理大数据内存溢出
|
2024-06-12 17:35:06 +08:00 |
|
Harryxzy
|
e249de9a59
|
报表导出单元格格式
|
2024-06-12 16:01:09 +08:00 |
|
钱涛
|
1983ba968c
|
去除日志
系统薪资项目配置不需要重启
|
2024-06-12 15:35:40 +08:00 |