sy
|
51a181f3d1
|
薪酬系统-福利模块bug修复v5，根据福利方案id、险种id、缴纳对象、缴费状态查询明细
|
2022-11-03 17:05:11 +08:00 |
|
sy
|
73289ecef3
|
薪酬系统-福利模块bug修复v4
|
2022-11-03 16:17:59 +08:00 |
|
sy
|
278a01de01
|
薪酬系统-福利模块bug修复v4
|
2022-11-03 16:17:03 +08:00 |
|
sy
|
6571320e81
|
薪酬系统-福利模块bug修复v3
|
2022-11-03 13:32:31 +08:00 |
|
sy
|
1292aea8c7
|
薪酬系统-福利模块bug修复v2
|
2022-11-03 13:22:15 +08:00 |
|
sy
|
b0d55cd227
|
Merge branch 'release/2.1.2.2211.01' into feature/v2-welHistoryDetail-1104
|
2022-11-03 11:15:51 +08:00 |
|
sy
|
40462d9fec
|
薪酬系统-福利模块bug修复v1
|
2022-11-03 11:14:59 +08:00 |
|
sy
|
0c8c3b0c04
|
Merge branch 'feature/v2-welHistoryDetail-1104' into release/2.1.2.2211.01
|
2022-11-02 20:22:29 +08:00 |
|
sy
|
0895c653b0
|
薪酬系统-福利模块历史数据分片
|
2022-11-02 20:22:03 +08:00 |
 钱涛
|
1f2c2433e4
|
Merge remote-tracking branch 'origin/release/2.1.2.2211.01' into release/2.1.2.2211.01
|
2022-11-02 20:10:28 +08:00 |
|
钱涛
|
c29ee34c1e
|
分片删除
|
2022-11-02 20:10:16 +08:00 |
|
sy
|
3f6b549789
|
薪酬系统-福利模块基数保存问题
|
2022-11-02 20:08:04 +08:00 |
|
sy
|
553564a6b6
|
薪酬系统-福利模块档案一对多-公积金/其他福利档案个税扣缴义务人默认设置
|
2022-11-02 19:28:56 +08:00 |
|
钱涛
|
33e2e0e933
|
修复冲突
|
2022-11-02 17:36:34 +08:00 |
fcli
|
8873224123
|
Merge remote-tracking branch 'origin/release/2.1.2.2211.01' into release/2.1.2.2211.01
|
2022-11-02 17:33:26 +08:00 |
|
fcli
|
11f0a2c418
|
Merge branch 'fix/089' into release/2.1.2.2211.01
|
2022-11-02 17:32:49 +08:00 |
|
fcli
|
59f030adf8
|
Merge branch 'fix/104' into release/2.1.2.2211.01
# Conflicts:
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
|
2022-11-02 17:32:42 +08:00 |
|
sy
|
d3a9d71942
|
Merge remote-tracking branch 'remotes/origin/feature/v2-welfareBaseLimit-1104' into release/2.1.2.2211.01
|
2022-11-02 17:30:37 +08:00 |
|
sy
|
3cbf9b10e5
|
Merge branch 'feature/v2-oneToMoreBaseInfo-1104' into release/2.1.2.2211.01
|
2022-11-02 17:30:21 +08:00 |
|
钱涛
|
28be5f8e41
|
Merge branch 'hotfix/工资单发放合并计税bug' into release/2.1.2.2211.01
|
2022-11-02 17:22:19 +08:00 |
|
钱涛
|
73c24bcac5
|
工资单发放合并计税bug
|
2022-11-02 17:20:34 +08:00 |
Harryxzy
|
b7597ee826
|
Merge branch 'feature/V2-editDataCollection-11-03' into release/2.1.2.2211.01
|
2022-11-02 16:00:20 +08:00 |
|
sy
|
ac241262f8
|
薪酬系统-福利档案展示问题修复
|
2022-11-02 14:14:12 +08:00 |
|
sy
|
18bf4a8c51
|
薪酬系统-福利档案福利基数变更触发基数上下限约束相关逻辑优化
|
2022-11-02 11:48:15 +08:00 |
|
Harryxzy
|
b2f4ac314a
|
fix-serverBug
|
2022-11-01 17:52:11 +08:00 |
|
sy
|
eda168e617
|
薪酬系统-福利档案列表功能中历史数据处理逻辑顺序调整
|
2022-11-01 17:37:47 +08:00 |
|
sy
|
51412603e5
|
薪酬系统-福利档案基数上下限相关逻辑
|
2022-11-01 17:17:33 +08:00 |
|
Harryxzy
|
5d97954e48
|
往期累计情况一键清空和删除所选
|
2022-10-31 19:21:13 +08:00 |
|
钱涛
|
4c1ccc1efb
|
Merge branch 'hotfix/1031' into release
|
2022-10-31 18:34:05 +08:00 |
|
钱涛
|
78392b50dd
|
修复权限问题
|
2022-10-31 18:29:39 +08:00 |
|
fcli
|
81d91a3a2c
|
fix: 我的调薪记录问题修改,设置分页默认值
|
2022-10-31 16:37:39 +08:00 |
|
sy
|
126a048a76
|
薪酬系统-福利档案选中导出功能优化
|
2022-10-31 16:30:59 +08:00 |
|
Harryxzy
|
e8ac395300
|
fix-专项附加扣除taxAgentId为空
|
2022-10-31 16:04:06 +08:00 |
|
sy
|
60652dfbde
|
薪酬系统-福利档案高级搜索增加分部字段及相关逻辑
|
2022-10-31 16:00:46 +08:00 |
|
Harryxzy
|
317fb5e8ac
|
数据采集-编辑前查看功能
|
2022-10-31 14:50:54 +08:00 |
|
sy
|
cfb682655e
|
薪酬系统-福利档案全部导出问题修复
|
2022-10-31 14:46:32 +08:00 |
|
钱涛
|
4d981a0aa0
|
fix in out 1000
|
2022-10-31 14:34:09 +08:00 |
|
sy
|
b28887bde9
|
薪酬系统-福利方案基数上下限v1
|
2022-10-31 14:18:53 +08:00 |
|
sy
|
9c54d1872f
|
Merge remote-tracking branch 'remotes/origin/feature/v2-baseInfoOneToMore' into feature/v2-oneToMoreBaseInfo-1104
|
2022-10-31 09:56:58 +08:00 |
|
Harryxzy
|
d525c59d6d
|
Merge branch 'feature/V2-editDataCollection-11-03-tempDev' into feature/V2-editDataCollection-11-03
|
2022-10-28 16:38:17 +08:00 |
|
Harryxzy
|
e046b7e3fe
|
fix 一键清空
|
2022-10-28 16:35:51 +08:00 |
|
Harryxzy
|
09d85bdab3
|
考勤引用=编辑
|
2022-10-28 16:15:51 +08:00 |
|
sy
|
d6ec6ca25d
|
薪酬系统-福利台账核算一对多改造，在正常缴纳和补缴核算功能中，获取带核算数据增加筛选项（个税扣缴义务人）
|
2022-10-28 15:25:58 +08:00 |
|
sy
|
ab6811b818
|
薪酬系统-福利台账线下对比，数据对比逻辑优化
|
2022-10-28 15:23:03 +08:00 |
|
sy
|
747ac233ad
|
薪酬系统-福利档案一对多改造，福利档案待减员数据oracle数据库获取失败问题修复
|
2022-10-28 15:21:38 +08:00 |
|
Harryxzy
|
1f29ac67eb
|
累计、其他免税、往期 新增、删除、一键清空、编辑功能
|
2022-10-28 14:08:27 +08:00 |
|
sy
|
541afcf303
|
薪酬系统-福利档案一对多改造，福利档案增量数据对于删除数据处理逻辑调整
|
2022-10-28 10:24:43 +08:00 |
|
钱涛
|
e4200ee9f2
|
定薪流程
|
2022-10-28 10:19:06 +08:00 |
|
钱涛
|
4d540e113b
|
fix xml bug
|
2022-10-28 10:03:23 +08:00 |
|
fcli
|
31982fc1db
|
fix: 工资单发放页高级搜索功能不生效
|
2022-10-28 09:39:31 +08:00 |