Commit Graph

1180 Commits

Author SHA1 Message Date
fcli bf75c3831f fix: 一键累计添加日期 2022-11-09 15:39: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 eb7311f0f3 fix: 管理员可以编辑该扣缴义务人数据,其他人可以编辑本人数据&一键累计所有个税扣缴义务人下的人员 2022-11-09 10:40:55 +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 dffee9206f feat: 专项附加扣除模块 2022-11-09 10:40:05 +08:00
fcli 171f726bd3 feat: 专项附加扣除模块 2022-11-09 10:40:01 +08:00
fcli 5e69d07b7c feat: 专项附加扣除模块 2022-11-09 10:39:55 +08:00
钱涛 457fe51239 处理薪资档案重复数据 2022-11-07 17:05:50 +08:00
钱涛 2da0455c46 修复薪资档案个税扣缴义务人不显示的问题
处理历史数据改为异步
2022-11-07 15:11:24 +08:00
sy dc4f4d9032 薪酬系统-福利模块bug修复v11,基数上下限约束问题修复 2022-11-04 11:28:29 +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
钱涛 c3e6c9d83c Merge remote-tracking branch 'origin/release/2.1.2.2211.01' into release/2.1.2.2211.01 2022-11-04 10:42:12 +08:00
钱涛 86e3214d8e 核算日志 2022-11-04 10:42:05 +08:00
sy a331afe72d Merge remote-tracking branch 'remotes/origin/feature/v2-welHistoryDetail-1104' into release/2.1.2.2211.01 2022-11-04 10:23:58 +08:00
sy e09cc6955e 薪酬系统-福利模块bug修复v9,历史数据处理触发全量增员逻辑调整 2022-11-04 10:23:22 +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
钱涛 5f749e4646 错误日志 2022-11-03 21:37:25 +08:00
sy b1f1da3686 Merge remote-tracking branch 'remotes/origin/feature/v2-welHistoryDetail-1104' into release/2.1.2.2211.01 2022-11-03 21:05:44 +08:00
sy d279884168 薪酬系统-福利模块bug修复v7 2022-11-03 21:04:47 +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 51a181f3d1 薪酬系统-福利模块bug修复v5,根据福利方案id、险种id、缴纳对象、缴费状态查询明细 2022-11-03 17:05:11 +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 73289ecef3 薪酬系统-福利模块bug修复v4 2022-11-03 16:17:59 +08:00
sy 278a01de01 薪酬系统-福利模块bug修复v4 2022-11-03 16:17:03 +08:00
sy f22b4be74d Merge remote-tracking branch 'remotes/origin/feature/v2-welHistoryDetail-1104' into release/2.1.2.2211.01 2022-11-03 13:33:00 +08:00
sy 6571320e81 薪酬系统-福利模块bug修复v3 2022-11-03 13:32:31 +08:00
sy 7f4de3a209 Merge branch 'feature/v2-welHistoryDetail-1104' into release/2.1.2.2211.01 2022-11-03 13:24:12 +08:00
sy 1292aea8c7 薪酬系统-福利模块bug修复v2 2022-11-03 13:22:15 +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
钱涛 1f2c2433e4 Merge remote-tracking branch 'origin/release/2.1.2.2211.01' into release/2.1.2.2211.01 2022-11-02 20:10:28 +08:00
钱涛 c29ee34c1e 分片删除 2022-11-02 20:10:16 +08:00
sy 3f6b549789 薪酬系统-福利模块基数保存问题 2022-11-02 20:08:04 +08:00
sy 553564a6b6 薪酬系统-福利模块档案一对多-公积金/其他福利档案个税扣缴义务人默认设置 2022-11-02 19:28:56 +08:00
钱涛 33e2e0e933 修复冲突 2022-11-02 17:36:34 +08:00