 钱涛
|
5602d65ed8
|
Merge branch 'release/2.9.5.2309.01' into release/个税版本
# Conflicts:
# resource/WEB-INF/prop/hrmSalaryCustom.properties
|
2023-09-22 17:59:06 +08:00 |
|
钱涛
|
7c5af2166e
|
日期格式自定义配置
|
2023-09-22 17:57:47 +08:00 |
|
钱涛
|
a5d019799c
|
账套复制
|
2023-09-22 11:47:51 +08:00 |
|
钱涛
|
0545c6eb8c
|
Merge branch 'release/2.9.5.2309.01' into release/个税版本
|
2023-09-21 16:58:15 +08:00 |
Harryxzy
|
bf8ae9fd09
|
Merge branch 'fix/230902-导出报表为数值类型' into release/2.9.5.2309.01
|
2023-09-21 16:03:38 +08:00 |
|
Harryxzy
|
bc7d7b3326
|
Merge branch 'feature/230902_报表共享' into release/2.9.5.2309.01
|
2023-09-21 15:06:04 +08:00 |
|
Harryxzy
|
7a57849a25
|
报表fixbug
|
2023-09-21 15:05:39 +08:00 |
sy
|
f4883ad87c
|
Merge remote-tracking branch 'remotes/origin/feature/230901-社保福利方案搜索功能' into release/2.9.5.2309.01
|
2023-09-21 14:10:06 +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
|
efa818f8b9
|
核算结果导出数值项excel格式为数值
|
2023-09-21 13:36:23 +08:00 |
|
Harryxzy
|
cdefb1d310
|
Merge branch 'feature/230902_报表共享' into release/2.9.5.2309.01
|
2023-09-21 11:45:34 +08:00 |
|
Harryxzy
|
443368bdb3
|
Merge branch 'fix/230902-账套中从公式改为输入，核算公式展示错误' into release/2.9.5.2309.01
|
2023-09-21 11:44:23 +08:00 |
|
Harryxzy
|
ad6587b9b2
|
Merge branch 'fix/230902-能够重复反馈' into release/2.9.5.2309.01
|
2023-09-21 11:44:12 +08:00 |
|
钱涛
|
c86151225d
|
流程获取档案信息v2
|
2023-09-21 11:43:41 +08:00 |
|
Harryxzy
|
9e95e3402b
|
删除多余注释
|
2023-09-21 11:02:48 +08:00 |
|
钱涛
|
3609045de2
|
流程获取档案信息
|
2023-09-21 10:58:19 +08:00 |
|
Harryxzy
|
97b451e203
|
sql
|
2023-09-21 10:05:32 +08:00 |
|
Harryxzy
|
dfc8a1c578
|
报表共享
|
2023-09-21 09:38:38 +08:00 |
|
钱涛
|
3f3089369b
|
修复返回异常
|
2023-09-20 18:49:19 +08:00 |
|
sy
|
3167aaab63
|
薪酬系统-福利方案，修改查询参数
|
2023-09-20 17:29:44 +08:00 |
|
sy
|
05507180eb
|
薪酬系统-福利台账，调差保存时判断调差到对象是否为统计范围内福利项
|
2023-09-20 15:40:31 +08:00 |
|
Harryxzy
|
c40c31845c
|
账套中修改公式为输入，核算的公式页面展示为空字符串不是”输入“
|
2023-09-20 15:26:18 +08:00 |
|
Harryxzy
|
74e4d39b83
|
报表fix
|
2023-09-20 15:02:44 +08:00 |
|
sy
|
dc93a96c8d
|
薪酬系统-薪资核算，获取福利核算数据逻辑优化
|
2023-09-20 14:13:00 +08:00 |
|
Harryxzy
|
0eafc0ce94
|
报表temp
|
2023-09-20 09:10:47 +08:00 |
|
Harryxzy
|
5bd66b626f
|
查看工资单后能够继续反馈、确认
|
2023-09-19 16:21:23 +08:00 |
|
sy
|
bf6918264f
|
薪酬系统-福利方案，福利方案修改action
|
2023-09-19 15:24:44 +08:00 |
|
Harryxzy
|
897a7731bf
|
报表fixbug
|
2023-09-19 13:59:08 +08:00 |
|
Harryxzy
|
c7713353dd
|
报表fixbug
|
2023-09-19 13:34:51 +08:00 |
|
Harryxzy
|
5d4231c241
|
报表共享fix
|
2023-09-19 13:11:24 +08:00 |
|
钱涛
|
b0a25f6cf0
|
删除与组织冲突sql
|
2023-09-19 11:37:37 +08:00 |
|
钱涛
|
d9c56a0da4
|
修复switchs函数数据问题
|
2023-09-19 11:24:41 +08:00 |
|
sy
|
2afa94e3a4
|
Merge remote-tracking branch 'remotes/origin/release/2.9.5.2309.01' into feature/230901-福利台账-调差，支持一个人存在多个调差记录
|
2023-09-19 10:47:13 +08:00 |
|
Harryxzy
|
c95098a22b
|
报表共享fix
|
2023-09-18 19:14:06 +08:00 |
|
Harryxzy
|
5f1ef51892
|
报表共享temp
|
2023-09-18 18:20:53 +08:00 |
|
sy
|
5538a7d01e
|
薪酬系统-福利方案，增加查询功能
|
2023-09-18 16:30:52 +08:00 |
|
钱涛
|
6b97efde4d
|
往期累计新增字段的加解密
|
2023-09-18 14:43:02 +08:00 |
|
钱涛
|
88a59d3d01
|
处理空指针
|
2023-09-18 13:49:25 +08:00 |
|
sy
|
3826e89a72
|
薪酬系统-福利台账，福利核算逻辑优化，支持未设置基数，仅设置固定值的福利档案的核算
|
2023-09-15 15:38:20 +08:00 |
|
Harryxzy
|
7db0a475ff
|
Merge branch 'fix/230902-薪资账套复制缺少字段' into release/2.9.5.2309.01
|
2023-09-14 17:35:05 +08:00 |
|
Harryxzy
|
0675de75ed
|
修复复制账套时少复制
|
2023-09-14 17:32:01 +08:00 |
|
钱涛
|
2b13d0c7ef
|
定薪账套
|
2023-09-14 11:56:00 +08:00 |
|
sy
|
38bffb2a8b
|
薪酬系统-福利台账、档案，细化调差报错信息，编辑action修复新增个税扣缴义务人人员范围
|
2023-09-13 10:09:32 +08:00 |
|
sy
|
0ad4a63a6b
|
Merge remote-tracking branch 'remotes/origin/fix/230901-福利档案编辑问题修复' into feature/230901-福利台账-调差，支持一个人存在多个调差记录
|
2023-09-12 11:30:12 +08:00 |
|
sy
|
eb1966b703
|
薪酬系统-福利档案，编辑后保存功能，校验档案人员是否为非系统人员逻辑问题修复
|
2023-09-12 11:21:48 +08:00 |
|
sy
|
b276066b52
|
薪酬系统-福利台账，导入模板带出核算数据
|
2023-09-12 11:05:46 +08:00 |
|
sy
|
39971f726d
|
Merge remote-tracking branch 'remotes/origin/feature/230901-福利档案-非系统人员tab' into release/2.9.5.2309.01
|
2023-09-08 17:02:03 +08:00 |
|
sy
|
3e7180a25e
|
Merge remote-tracking branch 'remotes/origin/feature/230901-福利档案-非系统人员tab' into feature/230901-福利台账-调差，支持一个人存在多个调差记录
|
2023-09-08 16:57:32 +08:00 |
|
sy
|
ec406b7f8a
|
薪酬系统-福利档案，福利档案编辑并减员、编辑并增员action
|
2023-09-08 16:57:09 +08:00 |
|
sy
|
9bd270e77d
|
薪酬系统-福利台账，调差支持一人多条记录
|
2023-09-08 13:24:27 +08:00 |