 钱涛
|
729389dcef
|
Merge branch 'release/2.1.3.2211.03' into feature/report1110
|
2022-11-08 09:33:00 +08:00 |
sy
|
defa7dacc3
|
薪酬系统-福利档案全量增员、全量减员添加个税扣缴义务人筛选逻辑
|
2022-11-07 17:15:42 +08:00 |
|
钱涛
|
457fe51239
|
处理薪资档案重复数据
|
2022-11-07 17:05:50 +08:00 |
|
钱涛
|
2da0455c46
|
修复薪资档案个税扣缴义务人不显示的问题
处理历史数据改为异步
|
2022-11-07 15:11:24 +08:00 |
|
钱涛
|
f2fdbca8f7
|
脱敏表配置
|
2022-11-07 11:31:21 +08:00 |
|
sy
|
65aff3e5be
|
Merge remote-tracking branch 'remotes/origin/feature/v2-welHistoryDetail-1104' into release/2.1.2.2211.01
|
2022-11-04 11:08:54 +08:00 |
|
sy
|
f8aa2b423a
|
薪酬系统-福利模块bug修复v10，增量数据处理逻辑修复
|
2022-11-04 11:07:43 +08:00 |
|
钱涛
|
86e3214d8e
|
核算日志
|
2022-11-04 10:42:05 +08:00 |
|
sy
|
784399a936
|
Merge branch 'feature/v2-welHistoryDetail-1104' into release/2.1.2.2211.01
|
2022-11-04 09:18:37 +08:00 |
|
sy
|
49e1f7624f
|
薪酬系统-福利模块bug修复v8，历史数据处理触发全量增员逻辑调整，基数上下限逻辑调整
|
2022-11-04 09:17:49 +08:00 |
|
钱涛
|
f1f8ae53af
|
档案项目默认生效时间取起始缴纳日期
|
2022-11-03 19:32:51 +08:00 |
|
sy
|
25d87c3480
|
Merge branch 'feature/v2-welHistoryDetail-1104' into release/2.1.2.2211.01
|
2022-11-03 19:04:32 +08:00 |
|
sy
|
f6141a894e
|
薪酬系统-福利模块bug修复v6,历史数据生成为“待增员”，并触发一次全量增员
|
2022-11-03 19:03:41 +08:00 |
|
钱涛
|
0cd5f1d4d8
|
一键发薪bug
|
2022-11-03 17:16:37 +08:00 |
|
sy
|
35022f7d09
|
Merge branch 'feature/v2-welHistoryDetail-1104' into release/2.1.2.2211.01
|
2022-11-03 16:19:59 +08:00 |
|
sy
|
278a01de01
|
薪酬系统-福利模块bug修复v4
|
2022-11-03 16:17:03 +08:00 |
|
sy
|
65208fb265
|
Merge remote-tracking branch 'remotes/origin/feature/v2-welHistoryDetail-1104' into release/2.1.2.2211.01
|
2022-11-03 11:37:03 +08:00 |
|
sy
|
b0d55cd227
|
Merge branch 'release/2.1.2.2211.01' into feature/v2-welHistoryDetail-1104
|
2022-11-03 11:15:51 +08:00 |
|
sy
|
40462d9fec
|
薪酬系统-福利模块bug修复v1
|
2022-11-03 11:14:59 +08:00 |
|
钱涛
|
54e64f58cb
|
申报表导出bug
|
2022-11-03 10:36:50 +08:00 |
|
sy
|
0c8c3b0c04
|
Merge branch 'feature/v2-welHistoryDetail-1104' into release/2.1.2.2211.01
|
2022-11-02 20:22:29 +08:00 |
|
sy
|
0895c653b0
|
薪酬系统-福利模块历史数据分片
|
2022-11-02 20:22:03 +08:00 |
|
钱涛
|
c29ee34c1e
|
分片删除
|
2022-11-02 20:10:16 +08:00 |
|
钱涛
|
33e2e0e933
|
修复冲突
|
2022-11-02 17:36:34 +08:00 |
fcli
|
8873224123
|
Merge remote-tracking branch 'origin/release/2.1.2.2211.01' into release/2.1.2.2211.01
|
2022-11-02 17:33:26 +08:00 |
|
fcli
|
11f0a2c418
|
Merge branch 'fix/089' into release/2.1.2.2211.01
|
2022-11-02 17:32:49 +08:00 |
|
fcli
|
59f030adf8
|
Merge branch 'fix/104' into release/2.1.2.2211.01
# Conflicts:
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
|
2022-11-02 17:32:42 +08:00 |
|
sy
|
d3a9d71942
|
Merge remote-tracking branch 'remotes/origin/feature/v2-welfareBaseLimit-1104' into release/2.1.2.2211.01
|
2022-11-02 17:30:37 +08:00 |
|
sy
|
3cbf9b10e5
|
Merge branch 'feature/v2-oneToMoreBaseInfo-1104' into release/2.1.2.2211.01
|
2022-11-02 17:30:21 +08:00 |
|
钱涛
|
28be5f8e41
|
Merge branch 'hotfix/工资单发放合并计税bug' into release/2.1.2.2211.01
|
2022-11-02 17:22:19 +08:00 |
|
钱涛
|
73c24bcac5
|
工资单发放合并计税bug
|
2022-11-02 17:20:34 +08:00 |
Harryxzy
|
b7597ee826
|
Merge branch 'feature/V2-editDataCollection-11-03' into release/2.1.2.2211.01
|
2022-11-02 16:00:20 +08:00 |
|
sy
|
18bf4a8c51
|
薪酬系统-福利档案福利基数变更触发基数上下限约束相关逻辑优化
|
2022-11-02 11:48:15 +08:00 |
|
sy
|
eda168e617
|
薪酬系统-福利档案列表功能中历史数据处理逻辑顺序调整
|
2022-11-01 17:37:47 +08:00 |
|
sy
|
51412603e5
|
薪酬系统-福利档案基数上下限相关逻辑
|
2022-11-01 17:17:33 +08:00 |
|
Harryxzy
|
5d97954e48
|
往期累计情况一键清空和删除所选
|
2022-10-31 19:21:13 +08:00 |
|
钱涛
|
78392b50dd
|
修复权限问题
|
2022-10-31 18:29:39 +08:00 |
|
Harryxzy
|
e8ac395300
|
fix-专项附加扣除taxAgentId为空
|
2022-10-31 16:04:06 +08:00 |
|
Harryxzy
|
317fb5e8ac
|
数据采集-编辑前查看功能
|
2022-10-31 14:50:54 +08:00 |
|
sy
|
cfb682655e
|
薪酬系统-福利档案全部导出问题修复
|
2022-10-31 14:46:32 +08:00 |
|
sy
|
b28887bde9
|
薪酬系统-福利方案基数上下限v1
|
2022-10-31 14:18:53 +08:00 |
|
sy
|
9c54d1872f
|
Merge remote-tracking branch 'remotes/origin/feature/v2-baseInfoOneToMore' into feature/v2-oneToMoreBaseInfo-1104
|
2022-10-31 09:56:58 +08:00 |
|
Harryxzy
|
d525c59d6d
|
Merge branch 'feature/V2-editDataCollection-11-03-tempDev' into feature/V2-editDataCollection-11-03
|
2022-10-28 16:38:17 +08:00 |
|
Harryxzy
|
e046b7e3fe
|
fix 一键清空
|
2022-10-28 16:35:51 +08:00 |
|
Harryxzy
|
09d85bdab3
|
考勤引用=编辑
|
2022-10-28 16:15:51 +08:00 |
|
sy
|
d6ec6ca25d
|
薪酬系统-福利台账核算一对多改造，在正常缴纳和补缴核算功能中，获取带核算数据增加筛选项（个税扣缴义务人）
|
2022-10-28 15:25:58 +08:00 |
|
Harryxzy
|
1f29ac67eb
|
累计、其他免税、往期 新增、删除、一键清空、编辑功能
|
2022-10-28 14:08:27 +08:00 |
|
sy
|
541afcf303
|
薪酬系统-福利档案一对多改造，福利档案增量数据对于删除数据处理逻辑调整
|
2022-10-28 10:24:43 +08:00 |
|
fcli
|
31982fc1db
|
fix: 工资单发放页高级搜索功能不生效
|
2022-10-28 09:39:31 +08:00 |
|
sy
|
54a3f31cc2
|
薪酬系统-福利档案一对多改造，福利档案增量数据处理功能逻辑调整
|
2022-10-27 18:21:53 +08:00 |
|
Harryxzy
|
ddd0c49cdd
|
其他免税扣除-新增、删除所选、一键清空功能
|
2022-10-27 18:02:05 +08:00 |
|
sy
|
7b4bc74c0b
|
薪酬系统-福利档案一对多改造，福利档案增员功能逻辑调整
|
2022-10-27 18:00:05 +08:00 |
|
sy
|
825c72a892
|
薪酬系统-福利档案一对多改造，福利档案减员功能逻辑调整
|
2022-10-27 17:43:52 +08:00 |
|
sy
|
743bffb089
|
薪酬系统-福利档案一对多改造，福利档案编辑tab展示和保存相关逻辑调整
|
2022-10-27 16:23:54 +08:00 |
|
钱涛
|
104213fc04
|
1、提示优化
2、导入模板
3、定薪流程
|
2022-10-27 15:17:22 +08:00 |
|
Harryxzy
|
a406eed4b9
|
累计专项附加扣除-新增、删除所选、一键清空功能
|
2022-10-27 13:59:11 +08:00 |
|
sy
|
5daf7a1aff
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/v2-baseInfoOneToMore
|
2022-10-26 20:02:54 +08:00 |
|
Harryxzy
|
934c0b8914
|
fixbug
|
2022-10-26 18:59:32 +08:00 |
|
Harryxzy
|
c0bb94bf71
|
editDataCollection-2
|
2022-10-26 18:35:23 +08:00 |
|
钱涛
|
d72362f7b7
|
档案模板注释
|
2022-10-26 18:05:04 +08:00 |
|
fcli
|
6f09d25077
|
fix: 我的调薪记录问题修改
|
2022-10-26 17:48:59 +08:00 |
|
sy
|
5a408e8bfc
|
薪酬系统-福利档案一对多改造v1,档案删除逻辑修改，档案id获取逻辑修改
|
2022-10-26 15:08:17 +08:00 |
|
钱涛
|
7a817af154
|
档案导入
|
2022-10-26 13:46:36 +08:00 |
|
sy
|
f75e7ebf32
|
薪酬系统-福利档案改造，列表tab页导入逻辑调整，对已有其他个税扣缴义务人的员工福利档案，不进行导入处理
|
2022-10-24 14:13:26 +08:00 |
|
sy
|
6941999a09
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy
|
2022-10-21 15:23:43 +08:00 |
|
sy
|
755aff52ba
|
薪酬系统-福利台账，修复线下对比列表排序问题
|
2022-10-21 14:15:03 +08:00 |
|
sy
|
21a4159ffa
|
薪酬系统-福利档案改造，福利台账补缴页列表、导入模板带出数据和导出功能添加runStatus约束
|
2022-10-20 17:33:29 +08:00 |
|
sy
|
24e5c97197
|
薪酬系统-福利档案改造，福利台账正常缴纳页导入模板带出数据和导出功能添加runStatus约束
|
2022-10-20 16:29:49 +08:00 |
|
sy
|
2a7c6cac42
|
薪酬系统-福利档案改造，福利台账线下对比列表仅展示处于在缴人员的数据
|
2022-10-20 16:08:48 +08:00 |
|
sy
|
2a6d556929
|
薪酬系统-福利台账核算和正常缴纳人员列表功能添加基础信息表runStatus字段的筛选逻辑
|
2022-10-20 11:27:27 +08:00 |
|
钱涛
|
a2716c4330
|
处理档案重复生成的问题
|
2022-10-19 13:36:31 +08:00 |
|
钱涛
|
47e390eb28
|
Merge branch 'feature/archive' into develop
|
2022-10-18 16:47:54 +08:00 |
|
钱涛
|
1f48539e1c
|
删除待定薪代办
删除待停薪代办
|
2022-10-18 16:44:31 +08:00 |
|
sy
|
09100ea916
|
薪酬系统-福利档案结构改造，正在缴纳页导入功能优化
|
2022-10-18 15:37:03 +08:00 |
|
sy
|
b04a9d39de
|
薪酬系统-福利档案结构改造，正在缴纳页导入功能优化
|
2022-10-17 17:53:05 +08:00 |
|
sy
|
21fa422350
|
薪酬系统-福利档案结构改造，取消停缴功能优化和导入功能添加runStatus条件
|
2022-10-17 17:24:40 +08:00 |
|
sy
|
b16133f61a
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy
|
2022-10-17 10:13:59 +08:00 |
|
sy
|
8fa59c2cf9
|
薪酬系统-福利档案结构改造，增员、减员接口返回结果格式调整
|
2022-10-17 10:13:38 +08:00 |
|
钱涛
|
5102d51b09
|
Merge branch 'feature/archive' into develop
|
2022-10-17 10:03:58 +08:00 |
|
sy
|
8d9a00bfff
|
薪酬系统-福利档案结构改造，取消停缴、增员、减员接口入参格式调整
|
2022-10-14 18:00:22 +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
|
4701c4de5c
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy
|
2022-10-14 14:31:35 +08:00 |
|
sy
|
e61d4f21c7
|
薪酬系统-福利档案结构改造，待减员页面的减员功能
|
2022-10-14 14:31:09 +08:00 |
|
sy
|
0e6520f838
|
薪酬系统-福利档案结构改造，批量更改福利档案状态功能和取消停缴功能
|
2022-10-13 17:36:15 +08:00 |
|
钱涛
|
0e05185599
|
操作接口
|
2022-10-13 16:24:59 +08:00 |
|
sy
|
b1cdeb0a4f
|
薪酬系统-福利档案结构改造，福利档案中增量数据自动处理功能v2
|
2022-10-13 16:04:54 +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 |
|
sy
|
187508c0f9
|
薪酬系统-福利档案结构改造，福利档案各tap页记录数统计功能
|
2022-10-12 10:38:41 +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 |
|
钱涛
|
ab575db152
|
Merge branch 'develop' into feature/archive
|
2022-10-10 17:36:29 +08:00 |
|
sy
|
a7b47a8bfe
|
薪酬系统-福利档案结构改造，档案列表导出增加runstatus条件、并将导入和历史数据生成的福利档案基础信息的默认runStatus置为2
|
2022-10-10 17:11:44 +08:00 |
|
钱涛
|
212631c9e5
|
Merge branch 'hotfix-1010' into develop
|
2022-10-10 17:08:22 +08:00 |