sy
|
f236b8e655
|
薪酬系统-福利台账，核算相关方法梳理和优化
|
2024-01-19 11:35:11 +08:00 |
Harryxzy
|
8164660ebf
|
Merge branch 'feature/231202-批量编辑' into release/2.9.10.2312.02
# Conflicts:
# src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
|
2024-01-08 15:34:32 +08:00 |
|
sy
|
a16ed64ac0
|
Merge remote-tracking branch 'remotes/origin/feature/231201-福利档案拆分个人和公司福利基数' into release/2.9.10.2312.02
|
2024-01-08 13:54:25 +08:00 |
|
Harryxzy
|
d6705e8917
|
产品-批量编辑
|
2023-12-11 13:09:20 +08:00 |
|
Harryxzy
|
2b6b1ef2c4
|
Merge branch 'custom/鲁控数字' into feature/231202-批量编辑
|
2023-12-11 11:36:59 +08:00 |
|
sy
|
1c5249c76e
|
薪酬系统-福利台账，福利核算、明细列表、导出数据，适配拆分福利档案个人和公司基数逻辑
|
2023-12-08 11:16:18 +08:00 |
|
Harryxzy
|
419baeb8cd
|
鲁控数字
|
2023-12-06 16:05:08 +08:00 |
|
sy
|
6dca2a4380
|
薪酬系统-福利档案，开启开关时，档案列表展示，区分个人和公司福利基数
|
2023-12-06 15:38:19 +08:00 |
 钱涛
|
390251bd63
|
Merge remote-tracking branch 'origin/release/2.9.9.2312.01' into release/2.9.9.2312.01
|
2023-12-05 15:08:44 +08:00 |
|
钱涛
|
dd48bff747
|
同步所有档案起始发薪日期为入职日期
|
2023-12-05 15:08:37 +08:00 |
|
Harryxzy
|
4eb931686e
|
鲁控数字temp
|
2023-12-05 14:57:34 +08:00 |
|
Harryxzy
|
3687bdfcdc
|
Merge remote-tracking branch 'origin/release/2.9.9.2312.01' into release/2.9.9.2312.01
|
2023-12-05 11:30:04 +08:00 |
|
sy
|
ce10204dab
|
Merge remote-tracking branch 'remotes/origin/feature/231102-福利台账，补差待编辑项扩充其他可缴纳福利项' into release/2.9.9.2312.01
|
2023-12-05 11:26:48 +08:00 |
|
Harryxzy
|
a0331112be
|
Merge branch 'fie/231102_线下对比列头改造' into release/2.9.9.2312.01
|
2023-12-05 11:26:22 +08:00 |
|
sy
|
22d749dcb3
|
Merge remote-tracking branch 'remotes/origin/fix/231101-福利档案及模板导出后文件损坏问题修复' into feature/231102-福利台账，补差待编辑项扩充其他可缴纳福利项
|
2023-11-28 16:05:29 +08:00 |
|
sy
|
c8e3d6312b
|
薪酬系统-福利核算，补差待编辑福利项列表功能接口，补缴第三种方式的待编辑福利项获取逻辑优化，补差编辑tab页待编辑福利项获取逻辑优化
|
2023-11-24 14:05:03 +08:00 |
|
钱涛
|
e1a4e275ff
|
短信模板设置接口
|
2023-11-16 15:41:29 +08:00 |
|
Harryxzy
|
97a5d4ab91
|
线下对比表头改造成分组的样式
|
2023-11-15 17:12:52 +08:00 |
|
sy
|
e0fcff792d
|
薪酬系统-福利档案，福利档案及模板导出参数设置优化
|
2023-11-15 10:17:12 +08:00 |
|
Harryxzy
|
f2a840576e
|
Merge branch 'fix/薪资核算导入下载模板bug' into release/3.0.0.2311.01
|
2023-11-07 11:24:25 +08:00 |
|
钱涛
|
e70a17cd19
|
捕获社保模块导出异常
|
2023-10-31 11:21:48 +08:00 |
|
sy
|
05b2c1868b
|
Merge remote-tracking branch 'remotes/origin/feature/231001-福利档案基数调整记录' into release/2.9.6.2310.01
|
2023-10-24 14:11:22 +08:00 |
|
sy
|
96bc325b43
|
薪酬系统-福利档案，福利档案基数调整记录列表查询入参和返回数据调整
|
2023-10-18 15:13:08 +08:00 |
|
sy
|
9ac549c06a
|
薪酬系统-福利档案，福利档案基数调整记录列表查询
|
2023-10-18 13:34:05 +08:00 |
|
sy
|
e68359ef50
|
Merge branch 'fix/231001-福利台账，导入模板下载接口由get改为post' into release/2.9.6.2310.01
|
2023-10-18 09:48:19 +08:00 |
|
钱涛
|
5d7a6bc241
|
调薪记录
|
2023-10-17 18:04:47 +08:00 |
|
钱涛
|
4a59859fa8
|
调薪记录
|
2023-10-12 17:34:09 +08:00 |
|
sy
|
6ae953c723
|
薪酬系统-福利台账，补缴、补差导入模板下载接口改为post类型
|
2023-10-12 11:45:21 +08:00 |
|
Harryxzy
|
03d3befbdd
|
token
|
2023-10-11 14:07:23 +08:00 |
|
sy
|
92a7daa9fa
|
薪酬系统-福利台账，正常缴纳导入模板下载接口改为post类型
|
2023-10-10 16:17:44 +08:00 |
|
钱涛
|
d98933832a
|
Merge branch 'feature/生成签名pdf' into release/2.9.6.2310.01
# Conflicts:
# src/com/engine/salary/web/SalaryBillController.java
|
2023-10-07 15:19:38 +08:00 |
|
钱涛
|
5241972151
|
工资单时效设置
|
2023-10-07 14:46:28 +08:00 |
|
钱涛
|
763393983c
|
工资单pdf
|
2023-09-26 17:52:46 +08:00 |
|
sy
|
5f84ed451b
|
Merge remote-tracking branch 'remotes/origin/feature/230901-福利台账-调差，支持一个人存在多个调差记录' into release/2.9.5.2309.01
|
2023-09-21 14:09:54 +08:00 |
|
Harryxzy
|
dfc8a1c578
|
报表共享
|
2023-09-21 09:38:38 +08:00 |
|
钱涛
|
9ab80de441
|
工资单pdf和签名
|
2023-09-20 14:45:44 +08:00 |
|
sy
|
0ad4a63a6b
|
Merge remote-tracking branch 'remotes/origin/fix/230901-福利档案编辑问题修复' into feature/230901-福利台账-调差，支持一个人存在多个调差记录
|
2023-09-12 11:30:12 +08:00 |
|
sy
|
ec406b7f8a
|
薪酬系统-福利档案，福利档案编辑并减员、编辑并增员action
|
2023-09-08 16:57:09 +08:00 |
|
Harryxzy
|
8ec5def53d
|
Merge branch 'feature/230901-同步薪资项目至账套' into release/2.9.5.2309.01
|
2023-09-07 10:05:14 +08:00 |
|
sy
|
bc21cc7a2e
|
薪酬系统-福利档案，导入模板带出数据时，参考当前搜索条件
|
2023-08-31 14:18:00 +08:00 |
|
Harryxzy
|
190bbe0875
|
同步薪资项目至账套
|
2023-08-31 09:24:41 +08:00 |
|
sy
|
299284872f
|
薪酬系统-福利方案，福利方案明细数据修改接口
|
2023-08-21 14:58:01 +08:00 |
|
Harryxzy
|
19cb2d9622
|
Merge branch 'feature/230703-薪资账套项目页面改造' into release/2.9.3.2308.01
|
2023-08-14 09:19:20 +08:00 |
|
Harryxzy
|
7ebb8d6618
|
Merge branch 'feature/230702-自定义工资项目展示名' into release/2.9.3.2308.01
|
2023-08-14 09:19:04 +08:00 |
|
sy
|
9f021b6d5e
|
薪酬系统-福利档案，修复非系统人员增量数据造成的bug
|
2023-08-08 15:03:52 +08:00 |
|
Harryxzy
|
6a01f0d785
|
Merge branch 'release/2.9.2.2307.02' into feature/230702-自定义工资项目展示名
|
2023-08-08 11:42:41 +08:00 |
|
sy
|
8c9049f1f7
|
Merge remote-tracking branch 'remotes/origin/feature/230702-非系统人员导入功能' into release/2.9.3.2308.01
|
2023-08-04 15:26:24 +08:00 |
|
sy
|
80f4f7d43b
|
薪酬系统-非系统人员管理，非系统人员导入模板
|
2023-07-27 09:39:03 +08:00 |
|
sy
|
74bb6e85c4
|
薪酬系统-福利方案，自定义福利项删除功能优化
|
2023-07-26 14:04:42 +08:00 |
|
Harryxzy
|
7763f16c0f
|
薪资账套薪资项目编辑功能
|
2023-07-26 13:43:53 +08:00 |