qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,536 Commits 293 Branches 39 Tags 49 MiB
Commit Graph

1471 Commits

Author SHA1 Message Date
sy a4924c19ee 薪酬系统-福利台账，退差数据列表功能v1 2022-11-16 14:05:43 +08:00
Harryxzy 00357cd9d8 回算功能-新建薪资账套默认 2022-11-16 10:32:05 +08:00
sy ce37694a95 薪酬系统-福利台账，退差数据删除功能v1 2022-11-16 10:15:05 +08:00
sy c339798dc8 薪酬系统-福利台账，退差数据导出功能v1 2022-11-16 09:48:17 +08:00
sy b647089eaf 薪酬系统-福利台账，退差数据新增功能v1 2022-11-15 17:58:37 +08:00
Harryxzy a3705c67a4 修改查看编辑调薪 2022-11-15 11:37:55 +08:00
sy 969bc6b413 薪酬系统-福利档案，福利档案新增接口v5 2022-11-15 11:13:16 +08:00
Harryxzy 323c1ec0e0 查看编辑调薪 2022-11-15 09:34:58 +08:00
fcli daa3d4ca9f feat: 薪资发放范围 2022-11-15 09:19:57 +08:00
Harryxzy 9dc6c61ed2 编辑调薪 2022-11-14 21:03:24 +08:00
sy 2e71ee7a35 薪酬系统-福利档案，福利档案新增接口v4 2022-11-14 10:22:15 +08:00
sy f3dc63244f 薪酬系统-福利档案，福利档案新增接口v3 2022-11-11 11:15:33 +08:00
sy 86dbb87f1b 薪酬系统-福利档案，福利档案新增接口v2 2022-11-11 09:11:53 +08:00
sy 451968f122 Merge remote-tracking branch 'remotes/origin/master' into feature/v2-addWelfareArchives-1117 2022-11-11 08:56:30 +08:00
sy 647dd80a20 薪酬系统-福利档案，福利档案新增接口v1 2022-11-11 08:56:05 +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 9dab99d3c5 个税申报功能-fix重启后回到开启 2022-11-10 10:28:03 +08:00
Harryxzy 1abd3d47f2 个税申报功能-重启状态前端展示开启 2022-11-10 10:14:29 +08:00
Harryxzy 3d4be3265e 个税申报功能-重启 2022-11-10 09:46:30 +08:00
fcli 459f7e5053 Merge branch 'feature/SpecialAddUpMerge' into release/2.1.3.2211.03 2022-11-10 09:33:22 +08:00
钱涛 f5622df8fe Merge branch 'feature/report1110' into release/2.1.3.2211.03 
# Conflicts:
#	src/com/engine/salary/sys/entity/param/AppSettingSaveParam.java
#	src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
 2022-11-09 19:03:14 +08:00
fcli 63ee9c9b8e fix: 一键累计添加日期与校验 2022-11-09 18:57:28 +08:00
sy 23e7065403 Merge branch 'feature/v2-allAddLimit-1110' into release/2.1.3.2211.03 2022-11-09 17:42:15 +08:00
钱涛 b55c339bb0 获取上月数据 2022-11-09 17:26:51 +08:00
fcli 815e37e50b fix: 一键累计添加日期与校验 2022-11-09 16:55:00 +08:00
Harryxzy 02a6ab11ce Merge branch 'fix/CollectionDataLongCompare' into release/2.1.3.2211.03 
# Conflicts:
#	src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
 2022-11-09 16:44:49 +08:00
Harryxzy 095a0665b8 Merge branch 'feature/V2-taxDeclarationSwitch-11-10' into release/2.1.3.2211.03 2022-11-09 16:12:35 +08:00
钱涛 e63c72f51e 逆向解密 2022-11-09 15:47:09 +08:00
fcli bf75c3831f fix: 一键累计添加日期 2022-11-09 15:39:00 +08:00
Harryxzy e2e383bd79 数据采集-Fix数据采集Long类型判断 2022-11-09 15:36:07 +08:00
fcli 07f9976d63 fix: 加解密处理 2022-11-09 14:32:04 +08:00
fcli 0b26eeec7e fix: 加解密处理 2022-11-09 14:32:00 +08:00
sy 2c691d1838 薪酬系统-福利档案增员问题修复 2022-11-09 11:25:46 +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
Harryxzy 775580f994 --- 2022-11-09 10:20:46 +08:00
sy b66fe2b593 薪酬系统-福利档案导入，增加对社保、公积金、其他福利方案设置是否为正确的福利类型 2022-11-09 09:53:13 +08:00
Harryxzy 8a704a9f5b 个税申报开关-添加新建判断 2022-11-08 16:27:29 +08:00
Harryxzy 0630fb7b7d 个税申报开关-查询是否开启 2022-11-08 13:58:21 +08:00
Harryxzy 1fb96be58b 个税申报开关 2022-11-08 11:22:56 +08:00
钱涛 21ccf6cbcb sql解密 2022-11-08 11:10:56 +08:00
钱涛 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 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
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 ac241262f8 薪酬系统-福利档案展示问题修复 2022-11-02 14:14:12 +08:00
sy 18bf4a8c51 薪酬系统-福利档案福利基数变更触发基数上下限约束相关逻辑优化 2022-11-02 11:48:15 +08:00
Harryxzy b2f4ac314a fix-serverBug 2022-11-01 17:52:11 +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
钱涛 4c1ccc1efb Merge branch 'hotfix/1031' into release 2022-10-31 18:34:05 +08:00
钱涛 78392b50dd 修复权限问题 2022-10-31 18:29:39 +08:00
fcli 81d91a3a2c fix: 我的调薪记录问题修改,设置分页默认值 2022-10-31 16:37:39 +08:00
sy 126a048a76 薪酬系统-福利档案选中导出功能优化 2022-10-31 16:30:59 +08:00
Harryxzy e8ac395300 fix-专项附加扣除taxAgentId为空 2022-10-31 16:04:06 +08:00
sy 60652dfbde 薪酬系统-福利档案高级搜索增加分部字段及相关逻辑 2022-10-31 16:00:46 +08:00
Harryxzy 317fb5e8ac 数据采集-编辑前查看功能 2022-10-31 14:50:54 +08:00
sy cfb682655e 薪酬系统-福利档案全部导出问题修复 2022-10-31 14:46:32 +08:00
钱涛 4d981a0aa0 fix in out 1000 2022-10-31 14:34:09 +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
sy ab6811b818 薪酬系统-福利台账线下对比，数据对比逻辑优化 2022-10-28 15:23:03 +08:00
sy 747ac233ad 薪酬系统-福利档案一对多改造，福利档案待减员数据oracle数据库获取失败问题修复 2022-10-28 15:21:38 +08:00
Harryxzy 1f29ac67eb 累计、其他免税、往期 新增、删除、一键清空、编辑功能 2022-10-28 14:08:27 +08:00
sy 541afcf303 薪酬系统-福利档案一对多改造，福利档案增量数据对于删除数据处理逻辑调整 2022-10-28 10:24:43 +08:00
钱涛 e4200ee9f2 定薪流程 2022-10-28 10:19:06 +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 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 85239c8e47 薪酬系统-福利档案一对多改造，社保/公积金/其他福利档案保存功能添加个税扣缴义务人筛选 2022-10-27 13:35:39 +08:00
sy 5daf7a1aff Merge remote-tracking branch 'remotes/origin/develop' into feature/v2-baseInfoOneToMore 2022-10-26 20:02:54 +08:00
sy 78f1d02e6d Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy 2022-10-26 19:04:06 +08:00
Harryxzy 934c0b8914 fixbug 2022-10-26 18:59:32 +08:00
sy 6227fef1c7 薪酬系统-福利档案改造，批量插入福利档案基础信息表 2022-10-26 18:57:23 +08:00
sy 47220181ec 薪酬系统-福利档案一对多改造v2 2022-10-26 18:51:36 +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 7279cfae05 薪酬系统-福利档案改造，增量逻辑调整，已有待增员档案直接删除，已有待减员档案不处理 2022-10-24 15:48:34 +08:00
sy f75e7ebf32 薪酬系统-福利档案改造，列表tab页导入逻辑调整，对已有其他个税扣缴义务人的员工福利档案，不进行导入处理 2022-10-24 14:13:26 +08:00
sy 0000e52433 薪酬系统-福利档案改造，增量数据处理逻辑调整，对已有其他个税扣缴义务人的员工福利档案，不进行增量处理 2022-10-24 14:12:28 +08:00
sy b1122ae391 薪酬系统-福利档案改造，增量数据处理逻辑修复（待增员转换到停止缴纳） 2022-10-21 15:51:08 +08:00
sy 6941999a09 Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy 2022-10-21 15:23:43 +08:00
sy 44d79dd5df 薪酬系统-福利方案，复制方案和编辑方案时，增加对方案名称中的空格删除处理 2022-10-21 15:23:22 +08:00
sy 755aff52ba 薪酬系统-福利台账，修复线下对比列表排序问题 2022-10-21 14:15:03 +08:00
sy 3ad40774dd 薪酬系统-福利档案,编辑栏字段显示null问题修复 2022-10-21 10:27:32 +08:00
sy 59ba439290 薪酬系统-福利档案改造，福利台账补缴页补缴人员添加功能，增加校验福利档案状态是否为正在缴纳或待减员状态 2022-10-21 09:50:18 +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
李栋 36ab692f9c Merge remote-tracking branch 'origin/develop' into develop 2022-10-20 14:27:41 +08:00
sy 99e0c22b4b 薪酬系统-福利档案改造，添加个税扣缴义务人删除人员时，待增员转为停止缴纳的逻辑 2022-10-20 14:09:36 +08:00
sy 2a6d556929 薪酬系统-福利台账核算和正常缴纳人员列表功能添加基础信息表runStatus字段的筛选逻辑 2022-10-20 11:27:27 +08:00
钱涛 a2716c4330 处理档案重复生成的问题 2022-10-19 13:36:31 +08:00
李栋 aead513c9c Merge branch 'develop' into dev-LeeD 
# Conflicts:
#	src/com/engine/salary/encrypt/AESEncryptUtil.java
 2022-10-19 11:26:24 +08:00
钱涛 705a28e563 Merge remote-tracking branch 'origin/develop' into develop 2022-10-19 09:41:48 +08:00
钱涛 61a35854b9 Merge branch 'feature/archive' into develop 2022-10-19 09:41:31 +08:00
钱涛 0e6ec32c12 档案导出 2022-10-19 09:39:01 +08:00
李栋 039c789181 薪资档案加密设置 2022-10-19 09:25:45 +08:00
李栋 9b9daab149 薪资档案加密设置 2022-10-18 18:02:04 +08:00
李栋 f45dac865c 薪资档案加密设置复原 2022-10-18 18:01:17 +08:00
李栋 30eb74c97c Merge branch 'develop' into dev-LeeD 2022-10-18 17:16:55 +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
李栋 b577295a5d 薪资档案加密设置复原 2022-10-18 15:42:49 +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
李栋 9b119a43df 薪资档案加密设置多余字段 2022-10-18 11:42:54 +08:00
sy 833163f77a Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy 2022-10-18 10:52:52 +08:00
钱涛 4b37775f78 档案发薪设置 2022-10-18 09:43:58 +08:00
李栋 95dc67e067 Merge branch 'dev-LeeD' into develop 2022-10-17 19:04:36 +08:00
李栋 679e13c310 薪资档案加密设置bug 2022-10-17 19:04:14 +08:00
sy b04a9d39de 薪酬系统-福利档案结构改造，正在缴纳页导入功能优化 2022-10-17 17:53:05 +08:00
sy dad2751490 Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy 2022-10-17 17:24:51 +08:00
sy 21fa422350 薪酬系统-福利档案结构改造，取消停缴功能优化和导入功能添加runStatus条件 2022-10-17 17:24:40 +08:00
李栋 ab074a0354 薪资档案加密设置bug 2022-10-17 14:18:01 +08:00
李栋 40720fc3e9 薪资档案加密设置bug 2022-10-17 14:15:20 +08:00
李栋 b11ef914b5 薪资档案加密设置bug 2022-10-17 13:53:37 +08:00
李栋 1910a77ce1 薪资档案加密设置 2022-10-17 11:46:59 +08:00
李栋 5c3fe06b62 Merge branch 'develop' into dev-LeeD 2022-10-17 11:14:33 +08:00
李栋 fc94b50c60 薪资档案加密设置 2022-10-17 11:14:21 +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
Harryxzy ab4565f5ce xzy-编辑自定义福利 2022-10-13 20:38:05 +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 053ac67604 Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy 2022-10-13 14:45:38 +08:00
sy fd63c16b93 薪酬系统-福利档案结构改造，福利档案中增量数据自动处理功能 2022-10-13 14:45:18 +08:00
sy 8d26f2ac46 薪酬系统-福利档案结构改造，福利档案中待减员数据自动处理功能 2022-10-12 17:17:06 +08:00
李栋 918441fb38 薪资档案加密设置加进度 2022-10-12 14:36:21 +08:00
李栋 708a947449 薪资档案加密设置加进度 2022-10-12 14:24:01 +08:00
李栋 3026833d2b 薪资档案加密设置更新 2022-10-12 11:17:30 +08:00
李栋 9ebe1acda9 薪资档案加密设置更新 2022-10-12 10:55:39 +08:00
李栋 df20bc83e4 薪资档案加密设置更新 2022-10-12 10:44:39 +08:00
sy 187508c0f9 薪酬系统-福利档案结构改造，福利档案各tap页记录数统计功能 2022-10-12 10:38:41 +08:00
李栋 2677d40503 Merge branch 'develop' into dev-LeeD 2022-10-11 17:41:12 +08:00
李栋 9f651b173e 薪资档案加密设置更新 2022-10-11 17:41:00 +08:00
钱涛 4e06cd585e Merge remote-tracking branch 'origin/develop' into develop 2022-10-11 15:07:47 +08:00
sy 0688b86cc2 Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy 2022-10-11 14:50:12 +08:00
sy e86dba922a 薪酬系统-福利档案结构改造，runStatus字段获取问题修复 2022-10-11 14:49:54 +08:00
钱涛 a18b008581 Merge branch 'develop' into feature/archive 2022-10-11 14:43:21 +08:00
李栋 dc541e8e00 Merge branch 'develop' into dev-LeeD 2022-10-11 09:40:32 +08:00
李栋 7960f74308 薪资档案加密设置更新 2022-10-11 09:40:23 +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
李栋 dea9fffe7e Merge branch 'dev-LeeD' into develop 2022-10-10 17:34:37 +08:00
李栋 e384c6c1c3 薪资档案加密设置更新 2022-10-10 17:29:36 +08:00
李栋 4a9a3bcd83 Merge remote-tracking branch 'origin/develop' into develop 2022-10-10 17:16:00 +08:00
李栋 f8d151e639 薪资档案加密设置更新 2022-10-10 17:15:20 +08:00
sy a7b47a8bfe 薪酬系统-福利档案结构改造，档案列表导出增加runstatus条件、并将导入和历史数据生成的福利档案基础信息的默认runStatus置为2 2022-10-10 17:11:44 +08:00
钱涛 2de432dc03 Merge remote-tracking branch 'origin/develop' into develop 2022-10-10 17:08:28 +08:00
钱涛 212631c9e5 Merge branch 'hotfix-1010' into develop 2022-10-10 17:08:22 +08:00
钱涛 c5870f17a2 处理考勤值为空 2022-10-10 17:07:51 +08:00
sy b24c08474c 薪酬系统-福利档案结构改造，档案列表接口入参将runStatus调整为runStatuses，并修改对应逻辑 2022-10-10 16:58:43 +08:00
李栋 4b30bca5d1 薪资档案加密设置更新 2022-10-10 16:44:17 +08:00
李栋 a9c0168a69 Merge branch 'develop' into dev-LeeD 2022-10-10 16:43:00 +08:00
Harryxzy f217867969 xzy-fix-salarysobutil 2022-10-10 16:41:01 +08:00
钱涛 9781b67ddb Merge branch 'develop' into feature/archive 2022-10-10 15:41:31 +08:00
钱涛 824c3ca565 薪资列表 2022-10-10 15:40:51 +08:00
钱涛 816885609d 薪资列表 2022-10-10 15:15:23 +08:00
钱涛 41203342d0 薪资列表 2022-10-10 14:58:29 +08:00
李栋 5a613183d7 Merge branch 'develop' into dev-LeeD 2022-10-10 14:55:46 +08:00
李栋 bf494588f7 薪资档案加密设置更新 2022-10-10 14:55:36 +08:00
sy ed00d3fe89 薪酬系统-福利档案结构改造，福利台账核算中的补缴人元添加时判断是否已存在福利档案的数据源调整为福利档案基础信息表 2022-10-10 14:20:02 +08:00
sy d6c6f446a9 薪酬系统-福利档案结构改造，恢复社保、公积金、其他福利档案表在档案导入时的个税扣缴义务人设置逻辑 2022-10-10 11:49:18 +08:00
sy 49502a2f70 薪酬系统-福利档案结构改造，通过福利档案人员状态枚举类设置档案基础信息的runStatus字段值 2022-10-10 11:27:08 +08:00
Harryxzy 5c4380cbe0 xzy-fix-薪资档案中人员范围更新时bug 2022-10-10 10:53:51 +08:00
sy a80c92c907 薪酬系统-福利档案结构改造,福利台账核算对于个税扣缴义务人的匹配源调整为福利档案基础信息表 2022-10-10 10:11:30 +08:00
李栋 f0b2c73cb6 Merge branch 'develop' into dev-LeeD 2022-10-10 10:01:09 +08:00
李栋 4f4535778e 薪资档案加密设置 2022-10-10 10:00:59 +08:00
sy 02d1822cff Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy 2022-10-10 09:53:16 +08:00
钱涛 ed454da0f0 福利档案状态枚举 2022-10-10 09:49:22 +08:00
钱涛 5431ed9506 历史数据处理 2022-10-10 09:47:09 +08:00
李栋 c92f4f0b28 Merge branch 'develop' into dev-LeeD 2022-10-10 09:44:03 +08:00
李栋 60396e90a3 薪资档案加密设置 2022-10-10 09:43:57 +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 7c358fe3a0 xzy-fix-薪资档案中默认人员范围 2022-10-09 17:51:30 +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
钱涛 1f0bf061dd 历史数据处理 2022-10-09 10:55:35 +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 7ffd295be0 Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 2022-10-08 09:14:54 +08:00
钱涛 521801849f 兼容5.7 2022-10-08 09:14:13 +08:00
sy 98a297ef27 薪酬系统-福利台账-正常缴纳导入模板数据未带出问题修复 2022-09-30 15:40:15 +08:00
sy 2f0090d3a0 薪酬系统-福利档案，福利档案按照工号查询无法实现模糊查询bug修复 2022-09-30 14:14:39 +08:00
sy dad3197c3a 薪酬系统-福利档案，导入模板表头字段提示bug修复 2022-09-30 11:44:51 +08:00
sy 2725fc8444 薪酬系统-福利台账，线下对比导入取消表id自增，修改对比数据查询参数格式 2022-09-30 10:55:46 +08:00
sy 0cfd2fc081 Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 2022-09-29 17:32:22 +08:00
sy 1e476e06a5 薪酬系统-福利台账，线下对比结果列表导出v1 2022-09-29 17:32:04 +08:00
李栋 96684b8ea3 Merge branch 'feature-LeeD' into develop 2022-09-29 16:21:22 +08:00
李栋 35e75dbba0 薪资档案引用时不能删除 2022-09-29 16:21:02 +08:00
钱涛 5285e518d9 fix核算合计 2022-09-29 15:34:21 +08:00
sy 5f9d929865 Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 2022-09-29 15:11:31 +08:00
sy a44a48450b 薪酬系统-福利台账，线下对比结果列表开发优化v1 2022-09-29 15:11:13 +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
钱涛 c270ecac82 新建福利方案去除名字空格 2022-09-29 11:16:56 +08:00
sy cec887a214 薪酬系统-福利台账，线下对比结果列表开发 2022-09-29 11:13:49 +08:00
钱涛 919d08a496 修复工资单查询 2022-09-29 10:28:46 +08:00
钱涛 92b2774ebf 三个数据采集模块删除无效的查询条件 2022-09-29 10:03:51 +08:00
钱涛 f8bb262906 档案 2022-09-29 09:32:29 +08:00
钱涛 d20ebb5a2a Merge branch 'develop' into feature/archive 2022-09-28 17:19:54 +08:00
钱涛 346445c70d 核算合计功能 2022-09-28 16:59:51 +08:00
钱涛 e0d68d6417 档案状态 2022-09-28 15:11:15 +08:00
钱涛 e48f576617 显示应用设置接口 2022-09-28 10:08:51 +08:00
钱涛 dfeb3fc5e4 修复薪资档案导出全部 2022-09-28 09:26:26 +08:00
钱涛 321b6ef0b2 修复重新核算会删除申报表 2022-09-27 18:20:40 +08:00
sy 1a60f36778 薪酬系统-福利台账，线下对比excel数据在入库前进行部分字段加密处理 2022-09-27 17:54:24 +08:00
钱涛 23a1396c12 核算列表求和 2022-09-27 17:43:43 +08:00
sy 78ce712116 薪酬系统-福利台账，线下对比excel数据导入功能 2022-09-27 17:36:06 +08:00
钱涛 1d635f1423 核算列表求和 2022-09-27 15:47:13 +08:00
钱涛 72c1d2b463 fix排序 2022-09-27 14:28:21 +08:00
sy bd3e44442d 薪酬系统-福利台账，正常缴纳导出添加工号信息 2022-09-27 11:39:57 +08:00
钱涛 08ac0e8b84 fix离职日期 2022-09-27 10:57:02 +08:00
sy 314dc8803c 薪酬系统-福利台账，正常缴纳线下对比模板下载功能 2022-09-27 10:55:57 +08:00