Harryxzy
|
012d8dfb07
|
社保福利流程，放开个税扣缴义务人限制
|
2022-12-05 10:13:16 +08:00 |
|
Harryxzy
|
6fe28ec41c
|
定薪流程，放开个税扣缴义务人限制
|
2022-12-05 09:57:27 +08:00 |
 钱涛
|
4b75ba67e9
|
人员分片
|
2022-11-25 14:48:49 +08:00 |
sy
|
dc69a479ec
|
Merge remote-tracking branch 'remotes/origin/feature/v3-siAccountRecession-1117' into release/2.3.1.2211.04
|
2022-11-25 14:44:45 +08:00 |
|
sy
|
366c1a8367
|
薪酬系统-福利台账，退差数据保存优化，分批查询
|
2022-11-25 14:43:45 +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
|
eeea00a408
|
薪酬系统-福利台账，退差保存数据功能优化
|
2022-11-25 10:17:35 +08:00 |
|
sy
|
bc20d37797
|
薪酬系统-福利台账，退差保存数据来源增加个税扣缴义务人筛选
|
2022-11-24 20:35:51 +08:00 |
|
钱涛
|
832b40e40a
|
新增核算时间变量
|
2022-11-24 17:21:16 +08:00 |
|
sy
|
e412be8d5e
|
薪酬系统-福利台账，退差数据编辑、删除后，刷新bill_batch表中统计数据
|
2022-11-24 14:19:58 +08:00 |
|
sy
|
931b3d8a82
|
薪酬系统-福利台账，修改退差数据单条查看返回格式v2
|
2022-11-24 11:04:12 +08:00 |
|
sy
|
dfcd7d88b0
|
薪酬系统-福利台账，修改退差数据单条查看返回格式
|
2022-11-24 10:43:20 +08:00 |
|
sy
|
d976ede775
|
薪酬系统-福利台账，退差数据新增后，刷新bill_batch表中统计数据
|
2022-11-24 09:46:06 +08:00 |
|
sy
|
e736cee6fd
|
Merge branch 'feature/v2-addWelfareArchives-1117' into feature/v3-siAccountRecession-1117
# Conflicts:
# src/com/engine/salary/service/SIAccountService.java
# src/com/engine/salary/service/impl/SIAccountServiceImpl.java
|
2022-11-24 09:39:13 +08:00 |
|
sy
|
0f50520aa9
|
薪酬系统-福利台账，抽取bill_batch表中统计数据刷新方法
|
2022-11-24 09:31:44 +08:00 |
|
钱涛
|
c5aa1aded7
|
缓存类
|
2022-11-23 18:36:33 +08:00 |
|
钱涛
|
2ab7049fa0
|
单个核算
|
2022-11-23 18:30:53 +08:00 |
|
钱涛
|
5221c22b5c
|
优化公式选择档案项目和薪资项目
|
2022-11-23 17:02:17 +08:00 |
|
sy
|
edf9e22d22
|
薪酬系统-福利台账，福利核算接口添加返回当前核算人id
|
2022-11-23 15:01:28 +08:00 |
|
钱涛
|
1307f485eb
|
同步人员范围
|
2022-11-22 15:53:05 +08:00 |
|
钱涛
|
264edf1bf2
|
同步人员范围
|
2022-11-22 15:37:07 +08:00 |
|
sy
|
2b29813f6b
|
薪酬系统-福利台账，退差数据导出
|
2022-11-22 13:35:09 +08:00 |
|
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
|
aa7a3ced01
|
薪酬系统-福利台账，导入数据刷新统计数据优化
|
2022-11-21 16:53:00 +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
|
e2a4a7157b
|
Merge remote-tracking branch 'remotes/origin/master' into feature/v2-addWelfareArchives-1117
|
2022-11-21 09:48:46 +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 |
|
钱涛
|
cc711bc411
|
修复加锁顺序
|
2022-11-17 19:04:42 +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 |
|
sy
|
47406b67c2
|
薪酬系统-福利档案，导入数据时，对于时间字符串，允许excel默认格式设置
|
2022-11-17 17:07:04 +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 |
|
sy
|
e0175f3ae7
|
薪酬系统-福利档案，导入数据时，若设置了福利方案，则该福利类型的起始缴纳月必填
|
2022-11-17 15:32:43 +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 |
|
sy
|
fee892e17b
|
薪酬系统-福利档案，导入数据在设置福利档案时，对其下未设置福利项数值的字段默认为0，并参与基数上下限校验
|
2022-11-17 15:08:30 +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 |
|
sy
|
57300125cd
|
薪酬系统-福利台账，正常缴纳/补缴导入时候，刷新台账统计
|
2022-11-17 13:39:50 +08:00 |