sy
|
8bc16ae470
|
Merge branch 'master' into feature/v3-siAccountCompensation-1201
|
2022-11-28 14:58:23 +08:00 |
|
sy
|
1747a613dd
|
薪酬系统-福利台账，社保调差撤回v1
|
2022-11-28 14:57:29 +08:00 |
|
sy
|
49466f9f3b
|
薪酬系统-福利台账，社保调差默认配置保存v1
|
2022-11-28 13:42:53 +08:00 |
|
sy
|
8d211c7db0
|
薪酬系统-福利台账，社保调差保存v1
|
2022-11-28 11:35:05 +08:00 |
|
sy
|
75a7497a07
|
Merge remote-tracking branch 'remotes/origin/feature/v3-siAccountRecession-1117' into release/2.3.1.2211.04
# Conflicts:
# src/com/engine/salary/mapper/datacollection/EmployMapper.java
|
2022-11-25 13:55:29 +08:00 |
|
sy
|
58c7374a64
|
薪酬系统-福利台账，退差数据导出，添加个税扣缴义务人筛选
|
2022-11-25 11:14:11 +08:00 |
|
sy
|
f1bd574c81
|
薪酬系统-福利台账，调差v2
|
2022-11-23 15:39:42 +08:00 |
 钱涛
|
264edf1bf2
|
同步人员范围
|
2022-11-22 15:37:07 +08:00 |
|
sy
|
2b29813f6b
|
薪酬系统-福利台账，退差数据导出
|
2022-11-22 13:35:09 +08:00 |
|
sy
|
96a440a9a7
|
薪酬系统-福利台账，退差数据新增时的可选择人员列表v1
|
2022-11-21 15:27:15 +08:00 |
|
sy
|
9c897c87dd
|
Merge remote-tracking branch 'remotes/origin/master' into feature/v3-siAccountRecession-1117
|
2022-11-21 09:54:44 +08:00 |
|
sy
|
df76d24a39
|
薪酬系统-福利台账，退差数据编辑v1
|
2022-11-18 17:56:21 +08:00 |
|
sy
|
746ab58ed3
|
薪酬系统-福利台账，退差数据单条查看v2
|
2022-11-18 16:07:20 +08:00 |
|
钱涛
|
9a9a9cdaf3
|
Merge branch 'feature/加锁221117' into release/2.2.2.2211.03
|
2022-11-17 19:05:55 +08:00 |
fcli
|
0f51d44cd4
|
Merge remote-tracking branch 'origin/release/2.2.2.2211.03' into release/2.2.2.2211.03
|
2022-11-17 14:43:59 +08:00 |
|
fcli
|
5743fa2162
|
feat: 其他附加扣除沿用上月功能完成
|
2022-11-17 14:28:10 +08:00 |
|
钱涛
|
271daf29be
|
批量锁定功能
|
2022-11-17 09:28:40 +08:00 |
|
sy
|
002de586d5
|
薪酬系统-福利台账，退差数据列表功能v3
|
2022-11-16 16:14:21 +08:00 |
|
sy
|
ce37694a95
|
薪酬系统-福利台账，退差数据删除功能v1
|
2022-11-16 10:15:05 +08:00 |
|
sy
|
c339798dc8
|
薪酬系统-福利台账，退差数据导出功能v1
|
2022-11-16 09:48:17 +08:00 |
Harryxzy
|
a3705c67a4
|
修改查看编辑调薪
|
2022-11-15 11:37:55 +08:00 |
|
Harryxzy
|
323c1ec0e0
|
查看编辑调薪
|
2022-11-15 09:34:58 +08:00 |
|
Harryxzy
|
9dc6c61ed2
|
编辑调薪
|
2022-11-14 21:03:24 +08:00 |
|
fcli
|
459f7e5053
|
Merge branch 'feature/SpecialAddUpMerge' into release/2.1.3.2211.03
|
2022-11-10 09:33:22 +08:00 |
|
fcli
|
63ee9c9b8e
|
fix: 一键累计添加日期与校验
|
2022-11-09 18:57:28 +08:00 |
|
Harryxzy
|
095a0665b8
|
Merge branch 'feature/V2-taxDeclarationSwitch-11-10' into release/2.1.3.2211.03
|
2022-11-09 16:12:35 +08:00 |
|
fcli
|
bf75c3831f
|
fix: 一键累计添加日期
|
2022-11-09 15:39:00 +08:00 |
|
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
|
dffee9206f
|
feat: 专项附加扣除模块
|
2022-11-09 10:40:05 +08:00 |
|
Harryxzy
|
1fb96be58b
|
个税申报开关
|
2022-11-08 11:22:56 +08:00 |
|
钱涛
|
457fe51239
|
处理薪资档案重复数据
|
2022-11-07 17:05:50 +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
|
3cbf9b10e5
|
Merge branch 'feature/v2-oneToMoreBaseInfo-1104' into release/2.1.2.2211.01
|
2022-11-02 17:30:21 +08:00 |
|
Harryxzy
|
5d97954e48
|
往期累计情况一键清空和删除所选
|
2022-10-31 19:21:13 +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 |
|
Harryxzy
|
317fb5e8ac
|
数据采集-编辑前查看功能
|
2022-10-31 14:50:54 +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 |
|
Harryxzy
|
1f29ac67eb
|
累计、其他免税、往期 新增、删除、一键清空、编辑功能
|
2022-10-28 14:08:27 +08:00 |
|
fcli
|
31982fc1db
|
fix: 工资单发放页高级搜索功能不生效
|
2022-10-28 09:39:31 +08:00 |
|
Harryxzy
|
ddd0c49cdd
|
其他免税扣除-新增、删除所选、一键清空功能
|
2022-10-27 18:02:05 +08:00 |
|
钱涛
|
104213fc04
|
1、提示优化
2、导入模板
3、定薪流程
|
2022-10-27 15:17:22 +08:00 |
|
Harryxzy
|
a406eed4b9
|
累计专项附加扣除-新增、删除所选、一键清空功能
|
2022-10-27 13:59:11 +08:00 |