fcli
|
07a07d2be8
|
feat: 专项附加扣除模块, 权限限制，导入导出优化，添加一键累计
|
2022-11-09 10:40:48 +08:00 |
|
fcli
|
9b77bf7139
|
feat: 专项附加扣除模块, 一键清空、分页bug等
|
2022-11-09 10:40:38 +08:00 |
|
fcli
|
92a6512dc8
|
feat: 专项附加扣除模块,去除月份，添加普通用户登录查看本人记录功能
|
2022-11-09 10:40:28 +08:00 |
|
fcli
|
171f726bd3
|
feat: 专项附加扣除模块
|
2022-11-09 10:40:01 +08:00 |
 钱涛
|
457fe51239
|
处理薪资档案重复数据
|
2022-11-07 17:05:50 +08:00 |
|
钱涛
|
2da0455c46
|
修复薪资档案个税扣缴义务人不显示的问题
处理历史数据改为异步
|
2022-11-07 15:11:24 +08:00 |
sy
|
65aff3e5be
|
Merge remote-tracking branch 'remotes/origin/feature/v2-welHistoryDetail-1104' into release/2.1.2.2211.01
|
2022-11-04 11:08:54 +08:00 |
|
sy
|
f8aa2b423a
|
薪酬系统-福利模块bug修复v10，增量数据处理逻辑修复
|
2022-11-04 11:07:43 +08:00 |
|
钱涛
|
86e3214d8e
|
核算日志
|
2022-11-04 10:42:05 +08:00 |
|
sy
|
784399a936
|
Merge branch 'feature/v2-welHistoryDetail-1104' into release/2.1.2.2211.01
|
2022-11-04 09:18:37 +08:00 |
|
sy
|
49e1f7624f
|
薪酬系统-福利模块bug修复v8，历史数据处理触发全量增员逻辑调整，基数上下限逻辑调整
|
2022-11-04 09:17:49 +08:00 |
|
钱涛
|
f1f8ae53af
|
档案项目默认生效时间取起始缴纳日期
|
2022-11-03 19:32:51 +08:00 |
|
sy
|
25d87c3480
|
Merge branch 'feature/v2-welHistoryDetail-1104' into release/2.1.2.2211.01
|
2022-11-03 19:04:32 +08:00 |
|
sy
|
f6141a894e
|
薪酬系统-福利模块bug修复v6,历史数据生成为“待增员”，并触发一次全量增员
|
2022-11-03 19:03:41 +08:00 |
|
钱涛
|
0cd5f1d4d8
|
一键发薪bug
|
2022-11-03 17:16:37 +08:00 |
|
sy
|
35022f7d09
|
Merge branch 'feature/v2-welHistoryDetail-1104' into release/2.1.2.2211.01
|
2022-11-03 16:19:59 +08:00 |
|
sy
|
278a01de01
|
薪酬系统-福利模块bug修复v4
|
2022-11-03 16:17:03 +08:00 |
|
sy
|
65208fb265
|
Merge remote-tracking branch 'remotes/origin/feature/v2-welHistoryDetail-1104' into release/2.1.2.2211.01
|
2022-11-03 11:37:03 +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 |
|
钱涛
|
54e64f58cb
|
申报表导出bug
|
2022-11-03 10:36:50 +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 |
|
钱涛
|
c29ee34c1e
|
分片删除
|
2022-11-02 20:10:16 +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
|
18bf4a8c51
|
薪酬系统-福利档案福利基数变更触发基数上下限约束相关逻辑优化
|
2022-11-02 11:48:15 +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 |
|
钱涛
|
78392b50dd
|
修复权限问题
|
2022-10-31 18:29:39 +08:00 |
|
Harryxzy
|
e8ac395300
|
fix-专项附加扣除taxAgentId为空
|
2022-10-31 16:04:06 +08:00 |
|
Harryxzy
|
317fb5e8ac
|
数据采集-编辑前查看功能
|
2022-10-31 14:50:54 +08:00 |
|
sy
|
cfb682655e
|
薪酬系统-福利档案全部导出问题修复
|
2022-10-31 14:46:32 +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 |
|
Harryxzy
|
1f29ac67eb
|
累计、其他免税、往期 新增、删除、一键清空、编辑功能
|
2022-10-28 14:08:27 +08:00 |
|
sy
|
541afcf303
|
薪酬系统-福利档案一对多改造，福利档案增量数据对于删除数据处理逻辑调整
|
2022-10-28 10:24:43 +08:00 |
|
fcli
|
31982fc1db
|
fix: 工资单发放页高级搜索功能不生效
|
2022-10-28 09:39:31 +08:00 |