sy
|
d7a4b30185
|
薪酬系统-福利台账，退差数据不参与薪资核算
|
2022-11-22 10:26:34 +08:00 |
|
sy
|
7c299e6199
|
薪酬系统-福利台账，退差数据新增v4
|
2022-11-22 09:46:37 +08:00 |
|
sy
|
15477cc8d5
|
薪酬系统-福利台账，退差数据新增v3
|
2022-11-21 17:52:28 +08:00 |
|
sy
|
955f8c255e
|
薪酬系统-福利台账，退差数据新增v2
|
2022-11-21 16:25:26 +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 |
Harryxzy
|
188096f931
|
Merge branch 'fix/salaryArchiveNoDataNEW' into release/2.2.2.2211.03
|
2022-11-17 19:04:58 +08:00 |
|
钱涛
|
cc711bc411
|
修复加锁顺序
|
2022-11-17 19:04:42 +08:00 |
|
Harryxzy
|
f19e4c2569
|
fix发薪日期为一个月最后一天时，薪资档案不显示NEW
|
2022-11-17 19:03:59 +08:00 |
|
钱涛
|
d07ded883f
|
修复加锁顺序
|
2022-11-17 18:53:22 +08:00 |
|
Harryxzy
|
11c4b1e4f7
|
Merge branch 'feature/V3-editSalaryAdjustment-11-17' into release/2.2.2.2211.03
|
2022-11-17 18:35:12 +08:00 |
|
钱涛
|
4779cc861e
|
相同itemid
|
2022-11-17 17:04:14 +08:00 |
|
Harryxzy
|
f762fd7030
|
调薪编辑、删除 放开校验限制
|
2022-11-17 16:51:07 +08:00 |
fcli
|
e6eaf96bcd
|
feat: 沿用上月增加校验
|
2022-11-17 15:39:39 +08:00 |
|
钱涛
|
10ffe88810
|
核算锁定
|
2022-11-17 15:17:49 +08:00 |
|
fcli
|
b03e5efbcf
|
feat: 沿用上月增加校验
|
2022-11-17 15:13:59 +08:00 |
|
fcli
|
0aa59757c5
|
feat: 沿用上月增加校验
|
2022-11-17 15:13: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
|
b3cd118c21
|
feat: 自动累计功能
|
2022-11-17 14:28:15 +08:00 |
|
fcli
|
5743fa2162
|
feat: 其他附加扣除沿用上月功能完成
|
2022-11-17 14:28:10 +08:00 |
|
Harryxzy
|
2bc1453ad8
|
Merge branch 'feature/V3-editSalaryAdjustment-11-17' into release/2.2.2.2211.03
|
2022-11-17 14:28:07 +08:00 |
|
Harryxzy
|
1eaef7fcd4
|
fix分页时，数据不显示
|
2022-11-17 09:53:40 +08:00 |
|
钱涛
|
271daf29be
|
批量锁定功能
|
2022-11-17 09:28:40 +08:00 |
|
Harryxzy
|
9f17c6e99a
|
fixBUG
|
2022-11-16 17:22:22 +08:00 |
|
sy
|
ad0b89b91a
|
薪酬系统-福利台账，退差数据单条查看v1
|
2022-11-16 17:02:54 +08:00 |
|
sy
|
002de586d5
|
薪酬系统-福利台账，退差数据列表功能v3
|
2022-11-16 16:14:21 +08:00 |
|
sy
|
7be9424f73
|
薪酬系统-福利台账，退差数据列表功能v2
|
2022-11-16 15:45:36 +08:00 |
|
Harryxzy
|
1bcb02d2e0
|
fix薪资账套关闭状态下无法删除bug
|
2022-11-16 14:22:25 +08:00 |
|
sy
|
a4924c19ee
|
薪酬系统-福利台账，退差数据列表功能v1
|
2022-11-16 14:05:43 +08:00 |
|
sy
|
ce37694a95
|
薪酬系统-福利台账，退差数据删除功能v1
|
2022-11-16 10:15:05 +08:00 |
|
sy
|
c339798dc8
|
薪酬系统-福利台账，退差数据导出功能v1
|
2022-11-16 09:48:17 +08:00 |
|
sy
|
b647089eaf
|
薪酬系统-福利台账，退差数据新增功能v1
|
2022-11-15 17:58:37 +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 |
|
Harryxzy
|
15749ecc10
|
Merge branch 'feature/V2-taxDeclarationSwitch-11-10' into release/2.1.3.2211.03
# Conflicts:
# src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
|
2022-11-10 11:25:01 +08:00 |
|
Harryxzy
|
c786dc2d14
|
个税申报功能-重启时间和薪资核算创建时间比较
|
2022-11-10 11:11:41 +08:00 |
|
Harryxzy
|
9dab99d3c5
|
个税申报功能-fix重启后回到开启
|
2022-11-10 10:28:03 +08:00 |
|
Harryxzy
|
1abd3d47f2
|
个税申报功能-重启状态前端展示开启
|
2022-11-10 10:14:29 +08:00 |
|
Harryxzy
|
3d4be3265e
|
个税申报功能-重启
|
2022-11-10 09:46:30 +08:00 |
|
fcli
|
459f7e5053
|
Merge branch 'feature/SpecialAddUpMerge' into release/2.1.3.2211.03
|
2022-11-10 09:33:22 +08:00 |
|
钱涛
|
f5622df8fe
|
Merge branch 'feature/report1110' into release/2.1.3.2211.03
# Conflicts:
# src/com/engine/salary/sys/entity/param/AppSettingSaveParam.java
# src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
|
2022-11-09 19:03:14 +08:00 |
|
fcli
|
63ee9c9b8e
|
fix: 一键累计添加日期与校验
|
2022-11-09 18:57:28 +08:00 |
|
sy
|
23e7065403
|
Merge branch 'feature/v2-allAddLimit-1110' into release/2.1.3.2211.03
|
2022-11-09 17:42:15 +08:00 |
|
钱涛
|
b55c339bb0
|
获取上月数据
|
2022-11-09 17:26:51 +08:00 |
|
fcli
|
815e37e50b
|
fix: 一键累计添加日期与校验
|
2022-11-09 16:55:00 +08:00 |
|
Harryxzy
|
02a6ab11ce
|
Merge branch 'fix/CollectionDataLongCompare' into release/2.1.3.2211.03
# Conflicts:
# src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
|
2022-11-09 16:44:49 +08:00 |