fcli
|
daa3d4ca9f
|
feat: 薪资发放范围
|
2022-11-15 09:19:57 +08:00 |
Harryxzy
|
15749ecc10
|
Merge branch 'feature/V2-taxDeclarationSwitch-11-10' into release/2.1.3.2211.03
# Conflicts:
# src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
|
2022-11-10 11:25:01 +08:00 |
|
Harryxzy
|
c786dc2d14
|
个税申报功能-重启时间和薪资核算创建时间比较
|
2022-11-10 11:11:41 +08:00 |
|
Harryxzy
|
3d4be3265e
|
个税申报功能-重启
|
2022-11-10 09:46:30 +08:00 |
|
fcli
|
815e37e50b
|
fix: 一键累计添加日期与校验
|
2022-11-09 16:55:00 +08:00 |
|
fcli
|
07f9976d63
|
fix: 加解密处理
|
2022-11-09 14:32:04 +08:00 |
|
fcli
|
0b26eeec7e
|
fix: 加解密处理
|
2022-11-09 14:32:00 +08:00 |
|
fcli
|
e3b7f7c732
|
fix: sql优化
|
2022-11-09 10:41:06 +08:00 |
|
fcli
|
dd5c2ba4ce
|
fix: 管理员可以编辑该扣缴义务人数据，其他人可以编辑本人数据&一键累计所有个税扣缴义务人下的人员
|
2022-11-09 10:41:00 +08:00 |
|
fcli
|
07a07d2be8
|
feat: 专项附加扣除模块, 权限限制，导入导出优化，添加一键累计
|
2022-11-09 10:40:48 +08:00 |
|
fcli
|
9b77bf7139
|
feat: 专项附加扣除模块, 一键清空、分页bug等
|
2022-11-09 10:40:38 +08:00 |
|
fcli
|
92a6512dc8
|
feat: 专项附加扣除模块,去除月份，添加普通用户登录查看本人记录功能
|
2022-11-09 10:40:28 +08:00 |
|
fcli
|
fafc157e63
|
feat: 专项附加扣除模块
|
2022-11-09 10:40:19 +08:00 |
|
fcli
|
171f726bd3
|
feat: 专项附加扣除模块
|
2022-11-09 10:40:01 +08:00 |
|
fcli
|
5e69d07b7c
|
feat: 专项附加扣除模块
|
2022-11-09 10:39:55 +08:00 |
sy
|
d279884168
|
薪酬系统-福利模块bug修复v7
|
2022-11-03 21:04:47 +08:00 |
|
sy
|
51a181f3d1
|
薪酬系统-福利模块bug修复v5，根据福利方案id、险种id、缴纳对象、缴费状态查询明细
|
2022-11-03 17:05:11 +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 |
|
sy
|
3cbf9b10e5
|
Merge branch 'feature/v2-oneToMoreBaseInfo-1104' into release/2.1.2.2211.01
|
2022-11-02 17:30:21 +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 |
|
Harryxzy
|
b2f4ac314a
|
fix-serverBug
|
2022-11-01 17:52:11 +08:00 |
|
sy
|
126a048a76
|
薪酬系统-福利档案选中导出功能优化
|
2022-10-31 16:30:59 +08:00 |
|
sy
|
60652dfbde
|
薪酬系统-福利档案高级搜索增加分部字段及相关逻辑
|
2022-10-31 16:00:46 +08:00 |
 钱涛
|
4d981a0aa0
|
fix in out 1000
|
2022-10-31 14:34:09 +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
|
09d85bdab3
|
考勤引用=编辑
|
2022-10-28 16:15:51 +08:00 |
|
sy
|
747ac233ad
|
薪酬系统-福利档案一对多改造，福利档案待减员数据oracle数据库获取失败问题修复
|
2022-10-28 15:21:38 +08:00 |
|
Harryxzy
|
1f29ac67eb
|
累计、其他免税、往期 新增、删除、一键清空、编辑功能
|
2022-10-28 14:08:27 +08:00 |
|
钱涛
|
4d540e113b
|
fix xml bug
|
2022-10-28 10:03:23 +08:00 |
|
fcli
|
31982fc1db
|
fix: 工资单发放页高级搜索功能不生效
|
2022-10-28 09:39:31 +08:00 |
|
sy
|
54a3f31cc2
|
薪酬系统-福利档案一对多改造，福利档案增量数据处理功能逻辑调整
|
2022-10-27 18:21:53 +08:00 |
李栋
|
ce96bcf276
|
加密字段xml更新otherPaymentBaseString
|
2022-10-27 18:16:54 +08:00 |
|
Harryxzy
|
ddd0c49cdd
|
其他免税扣除-新增、删除所选、一键清空功能
|
2022-10-27 18:02:05 +08:00 |
|
sy
|
743bffb089
|
薪酬系统-福利档案一对多改造，福利档案编辑tab展示和保存相关逻辑调整
|
2022-10-27 16:23:54 +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 |
|
sy
|
47220181ec
|
薪酬系统-福利档案一对多改造v2
|
2022-10-26 18:51:36 +08:00 |
|
sy
|
5a408e8bfc
|
薪酬系统-福利档案一对多改造v1,档案删除逻辑修改，档案id获取逻辑修改
|
2022-10-26 15:08:17 +08:00 |
|
钱涛
|
7a817af154
|
档案导入
|
2022-10-26 13:46:36 +08:00 |
|
sy
|
7279cfae05
|
薪酬系统-福利档案改造，增量逻辑调整，已有待增员档案直接删除，已有待减员档案不处理
|
2022-10-24 15:48:34 +08:00 |
|
sy
|
6941999a09
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy
|
2022-10-21 15:23:43 +08:00 |
|
sy
|
2a6d556929
|
薪酬系统-福利台账核算和正常缴纳人员列表功能添加基础信息表runStatus字段的筛选逻辑
|
2022-10-20 11:27:27 +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
|
a371ccc992
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy
|
2022-10-18 15:33:46 +08:00 |
|
sy
|
e59627776d
|
薪酬系统-福利档案结构改造，社保、公积金、其他福利信息编辑后的保存功能优化
|
2022-10-18 15:33:27 +08:00 |
|
钱涛
|
6edd65a77e
|
Merge branch 'feature/archive' into develop
|
2022-10-18 15:04:45 +08:00 |
|
钱涛
|
a29670d752
|
修复停薪
|
2022-10-18 15:04:29 +08:00 |