 钱涛
|
6edd65a77e
|
Merge branch 'feature/archive' into develop
|
2022-10-18 15:04:45 +08:00 |
|
钱涛
|
4b37775f78
|
档案发薪设置
|
2022-10-18 09:43:58 +08:00 |
sy
|
21fa422350
|
薪酬系统-福利档案结构改造，取消停缴功能优化和导入功能添加runStatus条件
|
2022-10-17 17:24:40 +08:00 |
|
钱涛
|
5102d51b09
|
Merge branch 'feature/archive' into develop
|
2022-10-17 10:03:58 +08:00 |
|
sy
|
3d714c2b8d
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy
|
2022-10-14 16:34:25 +08:00 |
|
sy
|
8a0e72f99c
|
薪酬系统-福利档案结构改造，档案列表接口返回结果优化
|
2022-10-14 16:34:10 +08:00 |
|
钱涛
|
77fc944491
|
获取保存档案配置表单
保存档案配置
|
2022-10-14 16:18:55 +08:00 |
Harryxzy
|
5233c85c81
|
Merge branch 'origin/feature/updateAndDeleteCustomCategory_xzy' into develop
|
2022-10-14 15:32:30 +08:00 |
|
Harryxzy
|
989dd13216
|
xzy-修改自定义福利名称
|
2022-10-14 15:17:56 +08:00 |
|
sy
|
0e6520f838
|
薪酬系统-福利档案结构改造，批量更改福利档案状态功能和取消停缴功能
|
2022-10-13 17:36:15 +08:00 |
|
sy
|
1aaa8ce43e
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy
|
2022-10-13 14:58:42 +08:00 |
|
钱涛
|
68076fc724
|
fix sqlserver增量数据空
|
2022-10-13 14:57:52 +08:00 |
|
sy
|
fd63c16b93
|
薪酬系统-福利档案结构改造，福利档案中增量数据自动处理功能
|
2022-10-13 14:45:18 +08:00 |
|
sy
|
8d26f2ac46
|
薪酬系统-福利档案结构改造，福利档案中待减员数据自动处理功能
|
2022-10-12 17:17:06 +08:00 |
|
钱涛
|
a18b008581
|
Merge branch 'develop' into feature/archive
|
2022-10-11 14:43:21 +08:00 |
|
sy
|
b2284d6669
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy
|
2022-10-11 09:03:46 +08:00 |
|
sy
|
b24c08474c
|
薪酬系统-福利档案结构改造，档案列表接口入参将runStatus调整为runStatuses，并修改对应逻辑
|
2022-10-10 16:58:43 +08:00 |
|
钱涛
|
9781b67ddb
|
Merge branch 'develop' into feature/archive
|
2022-10-10 15:41:31 +08:00 |
|
Harryxzy
|
5c4380cbe0
|
xzy-fix-薪资档案中人员范围更新时bug
|
2022-10-10 10:53:51 +08:00 |
|
钱涛
|
5431ed9506
|
历史数据处理
|
2022-10-10 09:47:09 +08:00 |
|
sy
|
9b1c6222ed
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy
|
2022-10-10 09:37:03 +08:00 |
|
sy
|
85d46938da
|
薪酬系统-福利档案导入改造，增加基础信息表数据插入逻辑
|
2022-10-10 09:36:34 +08:00 |
|
Harryxzy
|
8c4050fe73
|
xzy-fix-薪资账套人员状态传参问题
|
2022-10-09 15:20:04 +08:00 |
|
sy
|
7ac7d58a5f
|
薪酬系统-福利档案列表查询改造
|
2022-10-09 15:12:54 +08:00 |
|
Harryxzy
|
e3a2a52ab8
|
xzy-fix-薪资账套人员错误问题
|
2022-10-09 13:32:05 +08:00 |
|
sy
|
ad16c96910
|
薪酬系统-福利档案基础信息表实体和mapper
|
2022-10-09 09:22:37 +08:00 |
|
Harryxzy
|
b2b0abcaf5
|
xzy-fix-处理Employee_statuses历史数据
|
2022-10-08 17:21:38 +08:00 |
|
Harryxzy
|
6dcecfb1c1
|
xzy-fix-薪资账套
|
2022-10-08 16:00:08 +08:00 |
|
钱涛
|
4a20105260
|
Merge branch 'develop' into feature/archive
|
2022-10-08 11:42:54 +08:00 |
|
sy
|
44e4afbf72
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport
# Conflicts:
# src/com/engine/salary/mapper/InsuranceExportMapper.java
# src/com/engine/salary/mapper/InsuranceExportMapper.xml
# src/com/engine/salary/service/impl/SIAccountServiceImpl.java
|
2022-09-29 11:29:17 +08:00 |
|
sy
|
cec887a214
|
薪酬系统-福利台账，线下对比结果列表开发
|
2022-09-29 11:13:49 +08:00 |
|
钱涛
|
f8bb262906
|
档案
|
2022-09-29 09:32:29 +08:00 |
|
钱涛
|
e0d68d6417
|
档案状态
|
2022-09-28 15:11:15 +08:00 |
|
sy
|
78ce712116
|
薪酬系统-福利台账，线下对比excel数据导入功能
|
2022-09-27 17:36:06 +08:00 |
|
sy
|
bd3e44442d
|
薪酬系统-福利台账，正常缴纳导出添加工号信息
|
2022-09-27 11:39:57 +08:00 |
|
钱涛
|
08ac0e8b84
|
fix离职日期
|
2022-09-27 10:57:02 +08:00 |
|
钱涛
|
66a39a07a3
|
Merge branch 'feature/order' into develop
# Conflicts:
# src/com/engine/salary/biz/SIAccountBiz.java
|
2022-09-27 10:25:12 +08:00 |
|
钱涛
|
e2db30c816
|
排序
|
2022-09-27 10:19:09 +08:00 |
|
钱涛
|
6e726366ad
|
排序
|
2022-09-26 18:51:17 +08:00 |
|
sy
|
2d11bad723
|
薪酬系统-社保福利台账-核算-补缴项删除功能bug修复
|
2022-09-23 16:07:10 +08:00 |
|
Harryxzy
|
d647f9fcc3
|
xzy-复制薪资账套时，复制薪资项目隐藏选项
|
2022-09-22 09:06:53 +08:00 |
|
Harryxzy
|
06175bfa82
|
xzy-fix-社保福利台账中总览人数不正确问题
|
2022-09-21 15:52:36 +08:00 |
|
钱涛
|
90c18ec201
|
定薪
|
2022-09-20 18:02:45 +08:00 |
|
sy
|
5b74873a6e
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport
|
2022-09-20 10:34:43 +08:00 |
|
Harryxzy
|
5866136334
|
Merge branch 'origin/fix/archivePower' into develop
|
2022-09-20 09:41:04 +08:00 |
|
Harryxzy
|
2c795fe94a
|
xzy-fix-社保福利中社保方案、公积金方案等选择权限问题
|
2022-09-20 09:20:17 +08:00 |
|
钱涛
|
f678aa46d6
|
薪资档案排序
|
2022-09-19 18:21:34 +08:00 |
|
sy
|
7120d80689
|
薪酬系统-福利台账-补缴导入模板开发
|
2022-09-19 17:59:12 +08:00 |
|
钱涛
|
a7bd4a43d6
|
排序规则
|
2022-09-19 13:41:09 +08:00 |
|
sy
|
a3ec7caf44
|
薪酬系统导入方式配置-薪资档案调薪/初始化-导入,添加导入人员筛选配置化处理
|
2022-09-15 17:54:59 +08:00 |