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

1079 Commits

Author SHA1 Message Date
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