sy
|
cd671b5ae2
|
薪酬系统-福利台账，补差数据导入逻辑问题修复
|
2022-12-20 09:25:55 +08:00 |
|
sy
|
547e7cd662
|
薪酬系统-福利台账，补差数据导入时，拒绝对于未设置社保、公积金、其他福利的正常缴纳项进行补差
|
2022-12-19 17:26:44 +08:00 |
|
sy
|
2f10986e2b
|
薪酬系统-福利台账，重新核算时，保留已有补差数据，但是bill_batch统计信息只统计补差相关缴费数额，不统计补差相关人数信息
|
2022-12-19 14:47:49 +08:00 |
|
sy
|
53d48d63b0
|
薪酬系统-福利台账，补差新增数据时，过滤重复数据
|
2022-12-19 11:43:20 +08:00 |
|
sy
|
8157cafc98
|
薪酬系统-福利档案，取消停缴功能，添加人员是否在对应的个税扣缴义务人下的判断
|
2022-12-19 10:01:32 +08:00 |
|
sy
|
69e0d7e441
|
薪酬系统-福利台账，补差tab添加
|
2022-12-16 11:13:28 +08:00 |
|
sy
|
237f42f2ae
|
薪酬系统-福利台账，核算进度条逻辑优化
|
2022-12-15 18:03:28 +08:00 |
|
sy
|
cf08bbd842
|
薪酬系统-福利台账，补差相关加解密替换为新方法
|
2022-12-15 17:11:38 +08:00 |
|
sy
|
0787fb4d05
|
Merge remote-tracking branch 'remotes/origin/release/2.4.1.2212.02' into feature/v3-siAccountBalance-1208
# Conflicts:
# src/com/engine/salary/service/impl/SIAccountServiceImpl.java
|
2022-12-15 17:08:21 +08:00 |
 钱涛
|
b59ba320df
|
人员去重
|
2022-12-15 16:59:00 +08:00 |
fcli
|
7f7f4442ca
|
Merge branch 'feature/加密方法' into feature/加密方法&分页merge
|
2022-12-14 14:56:24 +08:00 |
|
fcli
|
beeadfc35c
|
feat: 加解密处理
|
2022-12-14 14:55:57 +08:00 |
|
fcli
|
b162afcbdd
|
Merge branch 'feature/加密方法' into feature/加密方法&分页merge
|
2022-12-14 13:51:22 +08:00 |
|
fcli
|
ad3f7595bd
|
feat: 空指针处理
|
2022-12-14 13:51:01 +08:00 |
|
fcli
|
d039781b74
|
feat: develop处理合并
|
2022-12-14 11:03:33 +08:00 |
|
fcli
|
dea2353ef2
|
Merge branch 'feature/变更分页' into feature/加密方法&分页merge
# Conflicts:
# src/com/engine/salary/biz/SIAccountBiz.java
# src/com/engine/salary/biz/SalaryArchiveItemBiz.java
# src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
# src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
# src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java
# src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java
|
2022-12-14 10:57:41 +08:00 |
|
fcli
|
d3de862d11
|
feat: 加密统一,薪资项目&社保档案详情...
|
2022-12-13 17:14:27 +08:00 |
|
sy
|
1e31dad7ad
|
薪酬系统-福利档案，待减员页面删除待办功能优化
|
2022-12-13 16:58:35 +08:00 |
|
fcli
|
1c6acb497c
|
feat: 加密统一，累计附加扣除详细
|
2022-12-13 10:49:51 +08:00 |
|
fcli
|
eabc983100
|
feat: 加密统一，社保福利档案&薪资核算结果
|
2022-12-13 10:15:31 +08:00 |
|
sy
|
32cffdccf5
|
薪酬系统-福利档案，批量减员逻辑变更，自动减员逻辑变更，无福利方案时，不关注最终缴纳月
|
2022-12-12 17:53:05 +08:00 |
|
sy
|
1fb706b7da
|
薪酬系统-福利档案，删除待办功能添加批量处理逻辑
|
2022-12-12 16:55:22 +08:00 |
|
fcli
|
1431308cc5
|
feat: 加密统一，薪资核算结果
|
2022-12-12 16:42:44 +08:00 |
|
sy
|
1b376464c4
|
薪酬系统-福利档案，删除待办功能（待减员页面）
|
2022-12-12 15:43:12 +08:00 |
|
fcli
|
93db32b758
|
feat: 加密统一，累计附加扣除&社保福利模块
|
2022-12-12 15:40:01 +08:00 |
|
sy
|
ae72d25431
|
Merge remote-tracking branch 'remotes/origin/master' into feature/v3-siAccountBalance-1208
|
2022-12-12 13:43:16 +08:00 |
|
钱涛
|
5e893160b4
|
加密方法
|
2022-12-12 10:36:06 +08:00 |
|
fcli
|
b58e71989d
|
feat: 统一修改到内存分页
|
2022-12-12 10:25:55 +08:00 |
|
钱涛
|
8dc2ddc3c8
|
加密方法
|
2022-12-12 09:37:15 +08:00 |
|
钱涛
|
309cb2047d
|
配置文件
|
2022-12-09 15:28:29 +08:00 |
|
sy
|
43157d25e3
|
薪酬系统-福利台账，补差列表v1
|
2022-12-09 14:50:29 +08:00 |
|
钱涛
|
77d3046966
|
所有个税扣缴义务人的树形
|
2022-12-08 17:48:46 +08:00 |
|
钱涛
|
30e8fd3733
|
流程中个税扣缴义务人已处理
|
2022-12-08 16:48:37 +08:00 |
|
fcli
|
8e2e85a986
|
Merge remote-tracking branch 'origin/release/2.3.2.2212.01' into release/2.3.2.2212.01
|
2022-12-08 16:43:06 +08:00 |
|
fcli
|
cc105ca051
|
Merge branch 'feat/SalarySendRange' into release/2.3.2.2212.01
|
2022-12-08 16:41:04 +08:00 |
|
fcli
|
269bfeee18
|
feat: 查询列表加快
|
2022-12-08 16:39:57 +08:00 |
|
fcli
|
89574f278b
|
feat: 查询列表加快
|
2022-12-08 16:31:16 +08:00 |
|
sy
|
0399731b9b
|
Merge remote-tracking branch 'remotes/origin/feature/v3-siAccountCompensation-1201' into release/2.3.2.2212.01
|
2022-12-08 16:25:28 +08:00 |
|
sy
|
0210f6542f
|
薪酬系统-福利台账，补差数据删除v1
|
2022-12-08 16:23:18 +08:00 |
|
fcli
|
fcca6950ac
|
feat: 修复bug
|
2022-12-08 15:45:15 +08:00 |
|
sy
|
ab6c0940c2
|
薪酬系统-福利台账，补差数据导出功能
|
2022-12-08 14:51:23 +08:00 |
|
钱涛
|
2c1421999b
|
Merge branch 'feature/扩展sql字符' into release/2.3.2.2212.01
|
2022-12-08 11:32:03 +08:00 |
|
钱涛
|
ea20dfb9ff
|
fix调薪action
|
2022-12-08 10:53:51 +08:00 |
|
钱涛
|
399563088d
|
流程生成人员范围
|
2022-12-08 10:49:51 +08:00 |
|
sy
|
979bb82661
|
薪酬系统-福利台账，调差数据保存时，增加新数据id信息的返回
|
2022-12-08 10:18:27 +08:00 |
|
sy
|
c94e28e68c
|
薪酬系统-福利台账，核算功能相关临时表数据删除逻辑优化
|
2022-12-08 10:10:48 +08:00 |
|
钱涛
|
fb39dbe0c4
|
流程生成人员范围
|
2022-12-07 20:16:14 +08:00 |
|
钱涛
|
0d417f1e49
|
流程生成人员范围
|
2022-12-07 20:15:52 +08:00 |
|
sy
|
f31e176cab
|
薪酬系统-福利台账，billBatch统计数据刷新方法优化（不需要统计补差数据中的人数信息）
|
2022-12-07 17:50:25 +08:00 |
|
sy
|
ccfffc200e
|
薪酬系统-福利台账，补差数据导入功能
|
2022-12-07 17:09:53 +08:00 |