 钱涛
|
11d1ee1a21
|
批量调薪action
|
2022-12-06 10:26:36 +08:00 |
|
钱涛
|
2f8f5f299e
|
批量调薪action
|
2022-12-06 09:52:55 +08:00 |
|
钱涛
|
5b1615675d
|
批量调薪action
|
2022-12-06 09:41:26 +08:00 |
|
钱涛
|
23dd15a568
|
批量调薪action
|
2022-12-05 16:01:08 +08:00 |
|
钱涛
|
991338a10e
|
合计行异步处理
|
2022-12-02 16:58:19 +08:00 |
|
钱涛
|
013f67469e
|
显示定制列的入职日期和离职日期
|
2022-12-01 14:33:21 +08:00 |
|
钱涛
|
ac0b0a7e25
|
公式提醒
|
2022-12-01 13:59:38 +08:00 |
|
钱涛
|
6cffbf4db7
|
取消安全级别
|
2022-11-30 16:59:58 +08:00 |
|
钱涛
|
a2ab9471be
|
核算记录id
|
2022-11-30 14:06:01 +08:00 |
|
钱涛
|
d8f99abb18
|
调薪，调薪校验流程接口
|
2022-11-30 11:23:58 +08:00 |
|
钱涛
|
8f75380f67
|
扩展sql字符
|
2022-11-28 10:39:46 +08:00 |
|
钱涛
|
0b2c01fb4c
|
人员信息获取
|
2022-11-25 15:54:31 +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
|
58c7374a64
|
薪酬系统-福利台账，退差数据导出，添加个税扣缴义务人筛选
|
2022-11-25 11:14:11 +08:00 |
|
钱涛
|
8d43e20c84
|
Merge branch 'feature/同步人员' into release/2.3.1.2211.04
|
2022-11-25 10:44:21 +08:00 |
|
sy
|
eeea00a408
|
薪酬系统-福利台账，退差保存数据功能优化
|
2022-11-25 10:17:35 +08:00 |
|
sy
|
bc20d37797
|
薪酬系统-福利台账，退差保存数据来源增加个税扣缴义务人筛选
|
2022-11-24 20:35:51 +08:00 |
|
钱涛
|
7808019c43
|
新增核算时间变量
|
2022-11-24 17:33:48 +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 |
|
钱涛
|
c2371ffcb3
|
取消缓冲时间
|
2022-11-24 10:30:00 +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 |
|
钱涛
|
6405610456
|
计划任务日志
|
2022-11-23 15:24:29 +08:00 |
|
sy
|
edf9e22d22
|
薪酬系统-福利台账，福利核算接口添加返回当前核算人id
|
2022-11-23 15:01:28 +08:00 |
|
钱涛
|
829375d314
|
同步人员范围定时任务
|
2022-11-22 16:14:54 +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 |
Harryxzy
|
5a3f035a41
|
修复定薪流程姓名重复BUG
|
2022-11-21 17:19:12 +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 |