 钱涛
|
6792b4c5aa
|
Merge branch 'feature/通过userid查询工资单详情'
|
2023-02-10 16:45:45 +08:00 |
|
钱涛
|
d1b4ae4a0b
|
过滤
|
2023-02-10 16:38:43 +08:00 |
Harryxzy
|
3b657db52a
|
线下对比Oracle导入报错
|
2023-02-10 09:59:18 +08:00 |
|
钱涛
|
8d011d8d49
|
Merge branch 'feature/账套群组不变' into release/2.6.1.2301.02
|
2023-02-09 17:32:00 +08:00 |
|
钱涛
|
5feed81803
|
Merge branch 'feature/通过userid查询工资单详情' into release/2.6.1.2301.02
|
2023-02-09 17:31:34 +08:00 |
sy
|
ba267d9dce
|
Merge remote-tracking branch 'remotes/origin/feature/v4-siSchemeAddPaymentCycle-0202' into release/2.6.1.2301.02
|
2023-02-09 17:24:29 +08:00 |
fcli
|
308a44a9a6
|
Merge remote-tracking branch 'origin/feature/SalaryItemAuth&FieldManage' into release/2.6.1.2301.02
|
2023-02-09 17:23:07 +08:00 |
|
钱涛
|
b6429eb41c
|
通过id查询工资单详情
|
2023-02-09 17:05:07 +08:00 |
|
钱涛
|
2c37086e70
|
账套群组保持不变
|
2023-02-09 15:33:35 +08:00 |
|
sy
|
6abc2068ea
|
薪酬系统-福利方案，福利方案新增、编辑、查看方法改进，福利核算加入福利方案中的缴纳周期因素
|
2023-01-31 17:40:34 +08:00 |
|
sy
|
ae6822dc91
|
薪酬系统-福利方案，福利方案对象的相关数据载体（po,dto）增加缴纳周期相关新字段，并对sql中的查询字段进行添加
|
2023-01-30 17:29:07 +08:00 |
|
Harryxzy
|
dc3bd34e0f
|
薪资回算sendStatus值update漏写
|
2023-01-14 13:59:13 +08:00 |
|
fcli
|
24e0e180be
|
feat: 薪资项目分权，修改查询
|
2023-01-12 14:20:09 +08:00 |
|
fcli
|
5aff04c834
|
feat: 薪资项目分权oracle异常问题
|
2023-01-12 14:19:54 +08:00 |
|
fcli
|
3ec5c34589
|
feat: 薪资项目分权oracle异常问题
|
2023-01-12 14:19:50 +08:00 |
|
fcli
|
f1bdd0ada9
|
feat: 薪资项目分权，修改落库
|
2023-01-12 14:19:46 +08:00 |
|
fcli
|
4bcd355254
|
feat: 薪资项目分权，修改查询
|
2023-01-12 14:19:43 +08:00 |
|
fcli
|
90b2edb96c
|
feat: 薪资项目分权代码合并
|
2023-01-12 14:19:39 +08:00 |
|
sy
|
b33771d9e4
|
薪酬系统-福利档案，列表数据展示添加入职日期、离职日期字段
|
2023-01-09 14:49:58 +08:00 |
|
sy
|
f1a123dfa4
|
Merge remote-tracking branch 'remotes/origin/master' into feature/v3-siRepairCreate-1229
|
2023-01-05 16:12:47 +08:00 |
|
sy
|
f53d788583
|
薪酬系统-福利档案，高级搜索功能支持根据个税扣缴义务人检索
|
2023-01-03 17:58:14 +08:00 |
|
sy
|
494462092d
|
薪酬系统-福利台账，补缴方式选择指定月的缴纳基数获取功能
|
2022-12-27 17:34:46 +08:00 |
|
Harryxzy
|
6262f62292
|
薪资回算Excel导入BUG
|
2022-12-26 23:17:32 +08:00 |
|
sy
|
d2be8e86ea
|
Merge branch 'feature/v3-siAccountBalance-1208' into release/2.4.2.2212.03
|
2022-12-22 09:09:00 +08:00 |
|
sy
|
28d1d16844
|
薪酬系统-福利台账，补差数据参与薪资核算
|
2022-12-21 11:12:14 +08:00 |
|
Harryxzy
|
ddea8c9066
|
回算工资单发放调整
|
2022-12-19 11:12:26 +08:00 |
|
Harryxzy
|
4fa7f9a5e7
|
回算-加解密开关
|
2022-12-14 14:45:24 +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 |
|
sy
|
32cffdccf5
|
薪酬系统-福利档案，批量减员逻辑变更，自动减员逻辑变更，无福利方案时，不关注最终缴纳月
|
2022-12-12 17:53:05 +08:00 |
|
sy
|
1b376464c4
|
薪酬系统-福利档案，删除待办功能（待减员页面）
|
2022-12-12 15:43:12 +08:00 |
|
sy
|
ae72d25431
|
Merge remote-tracking branch 'remotes/origin/master' into feature/v3-siAccountBalance-1208
|
2022-12-12 13:43:16 +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 |
|
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 |
|
Harryxzy
|
8e573f8bd7
|
补发工资单详情查看
|
2022-12-08 15:25:16 +08:00 |
|
sy
|
c94e28e68c
|
薪酬系统-福利台账，核算功能相关临时表数据删除逻辑优化
|
2022-12-08 10:10:48 +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 |
|
Harryxzy
|
19022fc505
|
fix 编辑工资单模板，补发显示部分
|
2022-12-07 10:34:41 +08:00 |
|
Harryxzy
|
5078fa9b87
|
fix 工资单发放报错
|
2022-12-06 15:59:38 +08:00 |
|
Harryxzy
|
c0d916c286
|
薪资回算功能，工资单部分
|
2022-12-06 15:29:08 +08:00 |
|
fcli
|
2877d58a1f
|
feat: sqlserver bug修复
|
2022-12-05 17:51:28 +08:00 |
|
fcli
|
acab57aa36
|
feat: 撤回范围修复
|
2022-12-05 16:05:38 +08:00 |
|
sy
|
014190f6d0
|
薪酬系统-福利台账，补缴列表查询优化，增加缴纳状态筛选
|
2022-12-05 10:09:43 +08:00 |
|
fcli
|
4fa64c6a8f
|
feat: mapper异常修复
|
2022-12-05 09:52:05 +08:00 |
|
Harryxzy
|
3ff3fd8e44
|
薪资回算-薪资核算部分（剩余核算归档）
|
2022-12-02 17:35:14 +08:00 |
|
fcli
|
c7b3341a13
|
feat: 查询异常问题修改
|
2022-12-01 17:41:10 +08:00 |
|
钱涛
|
013f67469e
|
显示定制列的入职日期和离职日期
|
2022-12-01 14:33:21 +08:00 |
|
sy
|
e462992206
|
薪酬系统-福利台账，社保调差撤回功能优化
|
2022-12-01 11:50:37 +08:00 |