Harryxzy
|
5f37281757
|
添加backcalctype
|
2022-12-14 18:21:25 +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 |
|
Harryxzy
|
4fa7f9a5e7
|
回算-加解密开关
|
2022-12-14 14:45:24 +08:00 |
|
Harryxzy
|
2136bbbd7f
|
Merge branch 'feature/加密方法&分页merge' into feature/V3-backItem-1215
|
2022-12-14 13:57:21 +08:00 |
|
Harryxzy
|
27602626cf
|
回算加密
|
2022-12-14 13:57:03 +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 |
|
Harryxzy
|
75220416bc
|
merge new解密
|
2022-12-14 12:32:42 +08:00 |
|
Harryxzy
|
0130b83f00
|
Merge branch 'feature/加密方法&分页merge' into feature/V3-backItem-1215
# Conflicts:
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
|
2022-12-14 12:21:42 +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 |
|
Harryxzy
|
3b6418263f
|
薪资账套复制-薪资回算
薪资核算-回算部分四舍五入
|
2022-12-13 16:39:39 +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 |
|
Harryxzy
|
ce76bc8b43
|
薪资账套list返回个税扣缴义务人id
|
2022-12-08 15:42:21 +08:00 |
|
Harryxzy
|
8e573f8bd7
|
补发工资单详情查看
|
2022-12-08 15:25:16 +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 |
|
Harryxzy
|
aed596523f
|
公司单发放详情报错
|
2022-12-07 18:00:31 +08:00 |
|
sy
|
f31e176cab
|
薪酬系统-福利台账，billBatch统计数据刷新方法优化（不需要统计补差数据中的人数信息）
|
2022-12-07 17:50:25 +08:00 |
|
sy
|
ccfffc200e
|
薪酬系统-福利台账，补差数据导入功能
|
2022-12-07 17:09:53 +08:00 |
|
钱涛
|
5079753c34
|
sql测试
|
2022-12-07 16:19:22 +08:00 |
|
钱涛
|
f20cecf042
|
sql测试
|
2022-12-07 16:17:29 +08:00 |
|
钱涛
|
cdb7f3a0a2
|
sql测试
|
2022-12-07 15:47:35 +08:00 |
|
Harryxzy
|
ecda5027de
|
fix 回算归档
|
2022-12-07 15:27:20 +08:00 |
|
Harryxzy
|
c4b17974ae
|
fix 归档，薪资核算不存在BUG
|
2022-12-07 15:21:29 +08:00 |
|
Harryxzy
|
f89c5d2970
|
工资单模板编辑补发模板
|
2022-12-07 15:03:39 +08:00 |
|
Harryxzy
|
19022fc505
|
fix 编辑工资单模板，补发显示部分
|
2022-12-07 10:34:41 +08:00 |
|
钱涛
|
1e03eca738
|
单独调薪检查action
|
2022-12-07 09:17:31 +08:00 |
|
钱涛
|
b39587e19d
|
单独调薪action
|
2022-12-06 18:08:50 +08:00 |
|
Harryxzy
|
5078fa9b87
|
fix 工资单发放报错
|
2022-12-06 15:59:38 +08:00 |
|
sy
|
70a5854dc7
|
薪酬系统-福利台账，调差数据保存时，增加公司费用数值字段的校验
|
2022-12-06 15:40:40 +08:00 |
|
Harryxzy
|
c0d916c286
|
薪资回算功能，工资单部分
|
2022-12-06 15:29:08 +08:00 |
|
sy
|
3fa017b13a
|
薪酬系统-福利台账，补差福利项列表功能和补差模板导出功能
|
2022-12-06 11:44:04 +08:00 |
|
钱涛
|
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 |
|
fcli
|
2877d58a1f
|
feat: sqlserver bug修复
|
2022-12-05 17:51:28 +08:00 |
|
sy
|
bea06f1d88
|
薪酬系统-福利台账，可调差人员列表功能返回格式增加target字段
|
2022-12-05 16:56:05 +08:00 |
|
fcli
|
acab57aa36
|
feat: 撤回范围修复
|
2022-12-05 16:05:38 +08:00 |
|
钱涛
|
23dd15a568
|
批量调薪action
|
2022-12-05 16:01:08 +08:00 |
|
sy
|
a04f4a915f
|
薪酬系统-福利台账，可调差人员列表功能取消分页逻辑
|
2022-12-05 15:42:49 +08:00 |
|
fcli
|
ff7b1047bc
|
feat: 发放异常拦截
|
2022-12-05 14:06:22 +08:00 |
|
Harryxzy
|
fa6e41d62e
|
Merge branch 'fix/intSalaryArchiveFLOWOpenPermissions' into release/2.3.2.2212.01
|
2022-12-05 10:43:09 +08:00 |
|
Harryxzy
|
1b570fe1aa
|
放开管理员限制
|
2022-12-05 10:34:25 +08:00 |
|
Harryxzy
|
012d8dfb07
|
社保福利流程，放开个税扣缴义务人限制
|
2022-12-05 10:13:16 +08:00 |
|
sy
|
014190f6d0
|
薪酬系统-福利台账，补缴列表查询优化，增加缴纳状态筛选
|
2022-12-05 10:09:43 +08:00 |
|
Harryxzy
|
6fe28ec41c
|
定薪流程，放开个税扣缴义务人限制
|
2022-12-05 09:57:27 +08:00 |
|
fcli
|
4fa64c6a8f
|
feat: mapper异常修复
|
2022-12-05 09:52:05 +08:00 |
|
sy
|
33aa8ea507
|
薪酬系统-福利档案，档案数据通过导入excel入库前，根据人员id和个税扣缴义务人进行去重
|
2022-12-02 17:57:09 +08:00 |
|
Harryxzy
|
3ff3fd8e44
|
薪资回算-薪资核算部分（剩余核算归档）
|
2022-12-02 17:35:14 +08:00 |
|
sy
|
22a7258229
|
薪酬系统-福利台账，福利核算添加核算进度查询逻辑
|
2022-12-02 17:08:35 +08:00 |
|
钱涛
|
991338a10e
|
合计行异步处理
|
2022-12-02 16:58:19 +08:00 |
|
fcli
|
c7b3341a13
|
feat: 查询异常问题修改
|
2022-12-01 17:41:10 +08:00 |
|
钱涛
|
013f67469e
|
显示定制列的入职日期和离职日期
|
2022-12-01 14:33:21 +08:00 |
|
钱涛
|
ac0b0a7e25
|
公式提醒
|
2022-12-01 13:59:38 +08:00 |
|
sy
|
e462992206
|
薪酬系统-福利台账，社保调差撤回功能优化
|
2022-12-01 11:50:37 +08:00 |
|
sy
|
119640e272
|
薪酬系统-福利台账，在福利台账重新核算时，删除调差数据时增加人员id筛选
|
2022-12-01 10:50:34 +08:00 |
|
sy
|
da7b9d8e6a
|
薪酬系统-福利台账，社保调差数据删除逻辑，在福利台账重新核算时，删除已有调查记录
|
2022-12-01 10:22:47 +08:00 |
|
sy
|
5436742c74
|
薪酬系统-福利台账，社保调差列表查询功能优化
|
2022-11-30 17:57:25 +08:00 |
|
钱涛
|
6cffbf4db7
|
取消安全级别
|
2022-11-30 16:59:58 +08:00 |
|
sy
|
d3d2074aed
|
薪酬系统-福利台账，在社保核算月数据删除时，社保调差数据被删除
|
2022-11-30 15:55:23 +08:00 |
|
sy
|
4d01c324e0
|
薪酬系统-福利台账，社保调差保存功能优化
|
2022-11-30 15:05:24 +08:00 |
|
sy
|
ee7309ffd1
|
薪酬系统-福利台账，社保调差项公司支出费用统计功能优化，对于已存在调差项，给出提示，并且不进行计算
|
2022-11-30 14:07:28 +08:00 |
|
钱涛
|
a2ab9471be
|
核算记录id
|
2022-11-30 14:06:01 +08:00 |
|
钱涛
|
d8f99abb18
|
调薪，调薪校验流程接口
|
2022-11-30 11:23:58 +08:00 |
|
sy
|
a0bda933a1
|
薪酬系统-福利台账，社保调差项公司支出费用统计功能
|
2022-11-29 17:36:18 +08:00 |
|
sy
|
2ceeeb165f
|
薪酬系统-福利台账，社保调差列表v1
|
2022-11-29 15:33:57 +08:00 |
|
fcli
|
4f9e2d8f80
|
feat: 路径修改接近e10
|
2022-11-29 14:36:37 +08:00 |
|
sy
|
f68219ff87
|
薪酬系统-福利档案，高级搜索分部逻辑优化
|
2022-11-28 16:58:20 +08:00 |
|
sy
|
5486d3f849
|
薪酬系统-福利台账，社保调差字段类型调整
|
2022-11-28 16:25:52 +08:00 |