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

1205 Commits

Author SHA1 Message Date
Harryxzy 8dc2db8729 xzy-fix-社保福利台账人数核算 2022-09-22 16:14:42 +08:00
钱涛 6717a8235a 我的薪资福利翻页问题 2022-09-22 16:04:48 +08:00
钱涛 6ee777ebb5 fix线下对比翻页问题 2022-09-22 15:31:28 +08:00
sy 1e9ad0727e Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 2022-09-22 14:49:30 +08:00
sy 3452f9ab96 薪酬系统-社保福利台账-核算-删除功能优化 2022-09-22 14:49:12 +08:00
钱涛 68142b4bbb 补缴必填校验 2022-09-22 14:25:50 +08:00
sy 83d5533322 Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 2022-09-22 14:01:12 +08:00
sy e75c7eefab 薪酬系统-社保福利档案-高级搜索工号搜索不生效bug修复 2022-09-22 13:59:55 +08:00
钱涛 7e2463cf10 人员状态枚举适配 2022-09-22 11:54:10 +08:00
钱涛 1573fc5bcf 人员状态枚举适配 2022-09-22 11:42:02 +08:00
sy f10a320a62 Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 2022-09-22 11:15:12 +08:00
sy 49e3b77995 薪酬系统-薪资档案-初始化导入模板表头属性优化 2022-09-22 10:25:31 +08:00
钱涛 b812454cd3 人员校验规则 2022-09-22 10:10:18 +08:00
Harryxzy 26c3f4580e Merge branch 'origin/feature/salarySobCopyHide_xzy' into develop 2022-09-22 09:39:22 +08:00
Harryxzy f2b83bf837 xzy-删除薪资账套时，删除对应的薪资项目隐藏信息 2022-09-22 09:35:52 +08:00
Harryxzy d647f9fcc3 xzy-复制薪资账套时，复制薪资项目隐藏选项 2022-09-22 09:06:53 +08:00
钱涛 63c7577ef8 工资单不显示空项功能 2022-09-21 19:13:17 +08:00
钱涛 f779b1bb11 工资单不显示空项功能 2022-09-21 19:08:44 +08:00
sy 0003057021 Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 2022-09-21 17:27:22 +08:00
sy b2ea7ebd29 薪酬系统-人员匹配枚举类 2022-09-21 17:26:49 +08:00
Harryxzy 4c7216e0bf Merge branch 'origin/fix/socialBonusUserCount_xzy' into develop 2022-09-21 15:54:40 +08:00
Harryxzy 06175bfa82 xzy-fix-社保福利台账中总览人数不正确问题 2022-09-21 15:52:36 +08:00
sy de150e063e 薪酬系统导入方式配置-人员筛选方法类调用优化以及调整相关调用该方法的代码 2022-09-21 15:49:55 +08:00
钱涛 a1cecd4041 申报表日志 2022-09-21 14:58:59 +08:00
sy ad3a2b4f69 Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 2022-09-21 14:48:49 +08:00
sy ad79cb2b3e 薪酬系统导入方式配置-数据采集-考勤引用-导入,添加导入人员筛选配置化处理 2022-09-21 14:47:26 +08:00
钱涛 d27e4685c5 方案过滤异常 2022-09-21 14:42:39 +08:00
sy 87b2bab9a9 薪酬系统导入方式配置-数据采集-往期累计情况-导入,添加导入人员筛选配置化处理 2022-09-21 13:57:58 +08:00
钱涛 57e4360030 通过员工id导入 2022-09-21 13:40:43 +08:00
sy d49d187506 薪酬系统导入方式配置-数据采集-其他免税扣除-导入,添加导入人员筛选配置化处理 2022-09-21 13:38:06 +08:00
钱涛 19ea334d57 获取员工信息方法 2022-09-21 11:52:06 +08:00
钱涛 0045a0dd59 福利的重新核算功能异常 2022-09-21 11:12:05 +08:00
sy b06eae55d8 Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 2022-09-21 10:47:49 +08:00
sy 78d1bf0554 薪酬系统-福利台账导入数据允许出现负数 2022-09-21 10:47:07 +08:00
钱涛 c08a660fa0 调薪异常 2022-09-20 19:07:56 +08:00
Harryxzy 550eec9198 Merge branch 'origin/fix/oracle_accountingArchive_xzy' into develop 2022-09-20 18:03:31 +08:00
Harryxzy 5c80188165 xzy-fix-oracle数据库中薪资核算归档时报错 2022-09-20 18:03:07 +08:00
钱涛 90c18ec201 定薪 2022-09-20 18:02:45 +08:00
钱涛 22b03f8f7e 调薪 2022-09-20 17:38:21 +08:00
sy a2b936ba23 Merge branch 'feature/checkImport' into develop 2022-09-20 16:56:59 +08:00
sy 16d141980d 薪酬系统-人员匹配方式枚举类 2022-09-20 16:56:40 +08:00
sy d64b73290a 薪酬系统-薪资档案调薪导入，关闭部分调整数据前后一致校验 2022-09-20 16:54:42 +08:00
sy b8a87d2fd8 Merge remote-tracking branch 'origin/develop' into develop 2022-09-20 16:37:21 +08:00
sy 546e976543 薪酬系统-福利台账-补缴导入,新旧数据整合bug修复 2022-09-20 16:36:01 +08:00
钱涛 f302654d0a 排序 2022-09-20 16:32:52 +08:00
Harryxzy 1db57838eb Merge branch 'origin/feature/addedemployeeExport' into develop 2022-09-20 16:19:22 +08:00
Harryxzy 183e63140a xzy-月度绩效环比增加人员导出功能 2022-09-20 16:18:43 +08:00
钱涛 8ef4c37112 Merge remote-tracking branch 'origin/develop' into develop 2022-09-20 15:47:28 +08:00
钱涛 f8f50380f7 排序 2022-09-20 15:47:22 +08:00
sy 5a1f92c3f0 Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 2022-09-20 15:27:11 +08:00
sy 882b1306b0 薪酬系统-薪资档案导入bug修复 2022-09-20 15:26:47 +08:00
钱涛 3a91225d65 排序 2022-09-20 15:07:42 +08:00
sy 5b74873a6e Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 2022-09-20 10:34:43 +08:00
sy 7f557903a8 薪酬系统-福利台账-补缴导入 2022-09-20 10:13:05 +08:00
Harryxzy 5866136334 Merge branch 'origin/fix/archivePower' into develop 2022-09-20 09:41:04 +08:00
Harryxzy 2c795fe94a xzy-fix-社保福利中社保方案、公积金方案等选择权限问题 2022-09-20 09:20:17 +08:00
钱涛 f678aa46d6 薪资档案排序 2022-09-19 18:21:34 +08:00
sy 7120d80689 薪酬系统-福利台账-补缴导入模板开发 2022-09-19 17:59:12 +08:00
钱涛 bc1e874a1c Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
 2022-09-19 16:45:10 +08:00
钱涛 830e099b57 排序规则 2022-09-19 16:44:32 +08:00
Harryxzy 44b3c76a8e xzy-同比增加人员 2022-09-19 16:05:59 +08:00
sy ff4884fbb9 Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 2022-09-19 15:13:42 +08:00
sy f54481bbf1 薪酬系统-福利台账补缴功能开发v1 2022-09-19 15:13:30 +08:00
sy b0cc2cc19d 薪酬系统导入方式配置-人员匹配全局配置的confValue默认设为0 2022-09-19 15:11:27 +08:00
sy eb033d64fd 薪酬系统-福利台账，补缴页新增补缴数据时，校验数据库中是否已有该组信息的补缴数据 2022-09-19 14:14:17 +08:00
钱涛 b464240ff7 Merge remote-tracking branch 'origin/develop' into develop 2022-09-19 13:45:14 +08:00
钱涛 a7bd4a43d6 排序规则 2022-09-19 13:41:09 +08:00
sy 86ba593d1f 薪酬系统导入方式配置-数据采集-累计附加专项扣除-导入,添加导入人员筛选配置化处理 2022-09-19 11:01:17 +08:00
sy 280c979536 薪酬系统-修改导入信息时对于姓名字段的依赖逻辑 2022-09-16 15:03:48 +08:00
sy 0d1a77d81b 薪酬系统-修复工号字段信息映射有误的问题 2022-09-16 14:22:11 +08:00
sy 4d9b7af975 薪酬系统-福利台账导入项添加社保合计、公积金合计、其他福利合计、合计四个字段可以选择，并增加这四个字段的更新逻辑 2022-09-16 14:21:15 +08:00
sy 478b9a3d16 薪酬系统导入方式配置-薪资核算-导入,添加导入人员筛选配置化处理 2022-09-16 13:23:37 +08:00
sy 7daa256584 薪酬系统-福利台账导入涉及的sql优化 2022-09-16 11:41:09 +08:00
sy 8492c2097b Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 2022-09-16 09:47:15 +08:00
sy a3ec7caf44 薪酬系统导入方式配置-薪资档案调薪/初始化-导入,添加导入人员筛选配置化处理 2022-09-15 17:54:59 +08:00
钱涛 d88e2bff4e 薪资档案列表按人事排序正序排列 2022-09-15 17:09:38 +08:00
sy c13ca103f3 薪酬系统导入方式配置-社保福利台账核算导入,添加导入人员筛选配置化处理 2022-09-15 16:14:34 +08:00
钱涛 23e89d15ec 定制 2022-09-15 15:43:47 +08:00
钱涛 b61b83976d 1、系统详情接口 2022-09-15 15:41:48 +08:00
sy 3c007f8e0b 薪酬系统导入方式配置-社保福利档案导入,添加导入人员筛选配置化处理 2022-09-15 15:31:34 +08:00
钱涛 d238502b2c 1、修复线下对比 
2、系统配置
 2022-09-15 15:15:34 +08:00
sy d491288296 薪酬系统导入方式配置-各导入模板添加工号字段 2022-09-15 10:43:34 +08:00
sy 8eb769ee05 Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 2022-09-14 14:37:19 +08:00
sy a6028c51e7 福利核算干预数据导入功能优化v2-针对单个保险种类的数值未填值时，默认取数据库中原有数值 2022-09-14 14:36:05 +08:00
钱涛 8c0b9038d6 1、系统配置列表 
2、修复调薪周期对于核算的结果不准确
 2022-09-14 11:28:17 +08:00
钱涛 198075209e 1、核算、合并计税使用税款所属期作为依据 
2、核算列表分页
 2022-09-13 16:03:55 +08:00
钱涛 32f5f25341 防止未归档时合并计税异常 2022-09-08 16:26:24 +08:00
钱涛 28551918c2 修复部门id和岗位id不显示 2022-09-08 10:13:57 +08:00
sy 6a52554d71 Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 2022-09-08 09:44:14 +08:00
sy 8c7a5d477a 福利核算干预数据导入功能优化v1 2022-09-08 09:43:46 +08:00
钱涛 243d8e0d6b 批量调薪前置校验 2022-09-07 16:35:57 +08:00
钱涛 572c4cb9f1 调薪前置校验 2022-09-07 16:12:43 +08:00
sy 1b34914e13 Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 2022-09-07 14:57:46 +08:00
sy 8f9a335dd0 福利核算干预数据导入预览 2022-09-07 14:57:07 +08:00
钱涛 06f6dcf8f2 Merge remote-tracking branch 'origin/develop' into develop 2022-09-07 09:46:02 +08:00
钱涛 8ff4e9e231 停薪操作 2022-09-07 09:45:37 +08:00
sy d4886c0d46 Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 2022-09-06 17:14:31 +08:00
sy 5a6df5a257 福利核算结果干预功能，福利核算项列表接口、福利核算导入模板下载接口、福利核算干预数据导入接口 2022-09-06 17:13:33 +08:00
钱涛 c84836d490 修复调薪导致起始缴纳日期消失 2022-09-06 17:12:56 +08:00
钱涛 e372173b74 获取系统配置接口 2022-09-05 17:20:57 +08:00
钱涛 299bbf1f66 达梦适配 2022-09-05 15:50:01 +08:00
sy 3445642489 优化薪资核算导入相关的唯一匹配逻辑v3 2022-09-02 15:40:05 +08:00
sy 85566329d9 Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 2022-09-02 12:47:36 +08:00
sy dd721aa314 Merge branch 'hotfix/checkImport0902' into develop 2022-09-02 12:45:11 +08:00
sy 43bf76b036 Merge remote-tracking branch 'remotes/origin/develop' into hotfix/checkImport0902 2022-09-02 12:43:53 +08:00
Harryxzy 0269506f78 xzy-fix当用户发薪日期为一个月最后一天时，薪资核算无数据bug 2022-09-02 12:41:58 +08:00
sy a1f310775d 优化薪资核算导入相关的唯一匹配逻辑v3 2022-09-02 12:41:22 +08:00
sy 79cab3629e 福利核算干预功能开发v1 2022-09-02 11:53:38 +08:00
sy 749279e372 优化薪资核算导入相关的唯一匹配逻辑v2 2022-09-02 11:04:51 +08:00
Harryxzy 40728ea598 Merge branch 'origin/fix/salaryArchiveImportDate_xzy' into develop 2022-09-01 17:07:18 +08:00
Harryxzy 38edb1bbb8 xzy-fix薪资档案导入时添加起始发薪日期格式校验 2022-09-01 17:06:30 +08:00
钱涛 cc24406319 向上求偶 2022-09-01 16:17:27 +08:00
Harryxzy 0d3f76c414 Merge branch 'origin/feature/addSubComSearchCondition_xzy' into develop 2022-09-01 09:22:11 +08:00
钱涛 c0498052cb Merge branch 'hotfix/0831' into develop 2022-08-31 17:23:32 +08:00
钱涛 c3201b66a3 fix福利人员导入异常 2022-08-31 17:19:12 +08:00
Harryxzy 387b6a2897 xzy-在薪资档案以及薪资核算的高级搜索中,增加分部搜索条件 2022-08-31 15:06:49 +08:00
Harryxzy 5ade93de8c Merge branch 'fix/peopleCount' into develop 2022-08-30 10:00:16 +08:00
sy 457f144bc6 Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 2022-08-30 09:30:38 +08:00
Harryxzy feb1e14c29 xzy-fix社保福利台账人数错误 2022-08-30 09:19:29 +08:00
sy 3fba03d482 优化薪资核算导入相关的唯一匹配逻辑及导入模板 2022-08-30 09:15:37 +08:00
钱涛 a13d56063b fix累计已预扣预缴税额，带入个税调差 2022-08-29 16:06:56 +08:00
Harryxzy e1239d3018 xzy-核算自定义列表添加分部 2022-08-29 14:50:26 +08:00
钱涛 f71e222c73 fix导入 2022-08-26 14:06:21 +08:00
sy 8ea34ef7dd Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 2022-08-26 09:18:06 +08:00
钱涛 aab48a1733 1、可见性范围回显 2022-08-25 17:34:30 +08:00
钱涛 60fb7fb110 1、可见性范围回显 2022-08-25 17:05:36 +08:00
钱涛 7cd4981a5a Merge remote-tracking branch 'origin/develop' into develop 2022-08-25 16:46:26 +08:00
钱涛 bfcda3525a 1、福利方案分权 
2、累计、往期、其他导入分权
3、导入精度
 2022-08-25 16:46:12 +08:00
Harryxzy 14b0797128 xzy-fix薪资项目保存报错 2022-08-25 15:44:00 +08:00
Harryxzy bc794b4585 xzy-fix社保福利方案无法新建自定义福利 2022-08-25 11:52:24 +08:00
sy 2041031e92 薪酬模块导入按钮匹配项优化 
姓名-部门-手机号
涉及接口，薪资档案导入接口、数据采集子菜单中的四个导入接口
 2022-08-25 11:43:52 +08:00
Harryxzy 8b84f0b15f xzy-fix北京城建集团-考勤引用中引用时报错问题 2022-08-25 09:59:19 +08:00
Harryxzy 6809839a2c Merge branch 'feature/addSalaryShowSwitch_xzy' into develop 2022-08-25 09:38:59 +08:00
Harryxzy 9244440a0d xzy-薪资项目显隐控制(修改传参itemHide为字符串) 2022-08-25 09:20:51 +08:00
钱涛 a4e6042adf 调薪流程按钮 2022-08-24 20:00:57 +08:00
钱涛 7a052e5ce0 Merge branch 'hotfix/0801' into develop 2022-08-24 17:12:11 +08:00
钱涛 71b2f6f41c 导入核算结果时去除多余的人员 2022-08-24 16:51:57 +08:00
钱涛 378d3a49e9 Merge branch 'hotfix/0801' into develop 2022-08-24 14:49:57 +08:00
钱涛 1567ecb956 核算结果的导入bug，null 2022-08-24 14:24:20 +08:00
钱涛 7dfe9ee732 福利方案分权 2022-08-24 12:03:04 +08:00
Harryxzy 289e685e09 xzy-薪资项目显隐控制 2022-08-24 10:31:42 +08:00
钱涛 0f62239d4e fix离职日期 
福利档案导出
 2022-08-23 14:16:20 +08:00
钱涛 bdd9b5aa07 修复申报时人员数量和核算时不一致 2022-08-22 10:47:22 +08:00
钱涛 b2704a84a4 Merge remote-tracking branch 'origin/develop' into develop 2022-08-18 15:05:46 +08:00
钱涛 e0a031e197 oracle异常 2022-08-18 15:02:04 +08:00
Harryxzy 4d0a73e030 xzy-解决社保福利方案删除时校验问题 2022-08-18 12:26:53 +08:00
钱涛 1969b44804 见分进角规则 2022-08-17 18:33:46 +08:00
Harryxzy e539c07162 Merge branch 'hotfix/batchSaveOracle' into develop 2022-08-17 13:29:24 +08:00
Harryxzy bf2f05e9ab 'xzy-解决oracle批量添加问题' 2022-08-17 13:28:33 +08:00
钱涛 5124520850 1、其他福利单位合计导出错误 
2、方案删除错误
 2022-08-17 11:46:35 +08:00
钱涛 bf28368845 fix oracle批量插入 2022-08-16 20:01:47 +08:00
钱涛 8f1e5a61bb fix档案搜索 
fix账套人员分页
 2022-08-16 17:26:16 +08:00
钱涛 1d464e5138 fix档案分页 2022-08-16 15:49:15 +08:00
钱涛 061eb55ac3 考勤引用 2022-08-16 14:42:31 +08:00
钱涛 5a99061306 1、薪资档案oracle查询异常 2022-08-16 12:01:04 +08:00
钱涛 a7c022f38d 1、批量插入报表支持oracle 
2、累计、往期返聘人员适配
 2022-08-16 10:39:45 +08:00
钱涛 ddccbb0d78 导入核算结果时，添加sql项 2022-08-15 17:16:48 +08:00
钱涛 20967f04ab 环比减少人员 2022-08-11 16:57:12 +08:00
钱涛 3ec90b3727 去除字符串空格 2022-08-11 14:12:37 +08:00
钱涛 7d79dcdfc2 修复社保福利列表高级搜索 2022-08-11 10:27:15 +08:00
钱涛 65cfe6c28a 去除无效代码 2022-08-09 16:54:29 +08:00
钱涛 4b800c436d 核算时只获取对应分部的档案 2022-08-09 16:45:22 +08:00
钱涛 deffd8e41f 薪资档案增加分部列 2022-08-09 10:09:55 +08:00
钱涛 d62473c356 修复往期累计情况 2022-08-08 17:45:18 +08:00
钱涛 24806d67f5 删除福利的扣缴义务人 2022-08-08 09:28:58 +08:00
钱涛 a91b411c08 去除千分位 2022-08-04 16:17:05 +08:00
钱涛 bdadbf4ca0 Merge remote-tracking branch 'origin/develop' into develop 2022-08-04 15:09:57 +08:00
钱涛 1eba64edd6 1、福利列表统一为个税扣缴义务人 
2、补缴导出无数据
 2022-08-04 15:09:40 +08:00
liuliang b2d8e371d1 Merge branch 'feature_liuliang_salaryAccounting' into develop 2022-08-04 14:54:47 +08:00
liuliang f86fcd29f2 修改核算范围bug 2022-08-04 14:53:06 +08:00
钱涛 d9bfd4d617 1、档案接口增强 
2、sql支持大写
3、合并计税搜索
 2022-08-04 11:45:26 +08:00
钱涛 07614d318f 1、福利核算人员修正 2022-08-04 09:55:10 +08:00
liuliang e4cdddc005 Merge branch 'develop' of https://gitee.com/qlmr/weaver-hrm-salary into develop 2022-08-03 17:28:03 +08:00
liuliang a4adb0da84 优化导入 2022-08-03 17:27:44 +08:00
钱涛 a340f1aaaf 1、薪资核算时取账套下的人员范围，且这个人需要再账套所属的扣缴义务人下由档案，且起始发薪和最后发薪日期在这个薪资周期内 
2、福利核算的范围需要在扣缴义务人下，且三个起始结束日期在核算周期内
 2022-08-03 17:02:03 +08:00
钱涛 e6207ad846 fix工资单列表缺少工号 2022-08-03 15:08:34 +08:00
钱涛 11ac3d6d51 Merge branch 'feature/outdatasource' into develop 
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
 2022-08-03 15:06:16 +08:00
钱涛 184bbe1e0b fix工资单列表缺少工号 2022-08-03 11:44:30 +08:00
钱涛 591c59228f fix工资单列表缺少工号 2022-08-03 11:42:49 +08:00
钱涛 a05425837d Merge branch 'hotfix/sqlserver' into develop 2022-08-03 11:08:50 +08:00
钱涛 7c5d7bba35 fix批量发放工资单 2022-08-03 11:08:23 +08:00
钱涛 99c0806b73 支持外部数据源 2022-08-03 10:47:26 +08:00
钱涛 c4831a1612 支持外部数据源 2022-08-03 10:08:43 +08:00
liuliang 90c1ad1c6c 优化代码和指定 2022-08-02 18:02:53 +08:00
liuliang 6a42f1c7c6 修改bug 2022-08-02 17:57:29 +08:00
钱涛 e9c95918eb 1、核算表头带上公式 
2、修复核算时取福利台账人员信息不准确
 2022-08-02 14:58:18 +08:00
钱涛 6d5e848a65 Merge remote-tracking branch 'origin/develop' into develop 2022-08-02 11:00:08 +08:00
钱涛 ab87e5cf08 劳务申报表列表 2022-08-02 10:59:12 +08:00
liuliang e06b341023 Merge branch 'develop' of https://gitee.com/qlmr/weaver-hrm-salary into develop 2022-08-01 14:35:39 +08:00
liuliang b516b06d8b 去除各种组织合并成个税扣缴义务人 2022-08-01 14:35:07 +08:00
钱涛 1d676365c7 Merge remote-tracking branch 'origin/develop' into develop 2022-08-01 14:16:08 +08:00
钱涛 a252d055ab 1、核算接口代理 
2、获取异常真实信息
 2022-08-01 14:15:09 +08:00
liuliang 50f047fb6f Merge branch 'develop' of https://gitee.com/qlmr/weaver-hrm-salary into develop 2022-07-29 17:19:41 +08:00
liuliang ea8a41d930 社保福利档案bug修复 2022-07-29 17:18:38 +08:00
钱涛 3f4c6954d1 Merge remote-tracking branch 'origin/develop' into develop 2022-07-29 10:34:11 +08:00
钱涛 b60758cd28 修复往期累计列表显示异常 2022-07-29 10:33:54 +08:00
liuliang c6c180afef Merge branch 'develop' of https://gitee.com/qlmr/weaver-hrm-salary into develop 2022-07-28 17:57:10 +08:00
liuliang 089cb2aa11 删除社保福利方案测试 2022-07-28 17:56:42 +08:00
钱涛 03f7efa2c9 Merge remote-tracking branch 'origin/develop' into develop 2022-07-28 17:20:41 +08:00
钱涛 c92a215bca 薪资档案导出全部时范围修改 2022-07-28 17:20:24 +08:00
liuliang 35fc07bb9a 社保福利方案bug修复 2022-07-28 17:18:51 +08:00
liuliang 28cc6e67f4 Merge branch 'feature_liuliang_20220726' into develop 2022-07-28 16:31:02 +08:00
liuliang f8c0f1b59d Merge branch 'fixbug_liuliang_recalculate' into develop 2022-07-28 16:30:27 +08:00
liuliang 1effdf42aa liuliang 2022-07-28 16:28:53 +08:00
钱涛 c14cca9b08 核算时添加核算人员过滤不是扣缴义务人下的人员 2022-07-28 16:23:39 +08:00
钱涛 b6f8e857d2 1、档案导入初始化修复 
2、核算档案
3、取消入职、离职日期作为核算人员的筛选条件
 2022-07-28 15:42:25 +08:00
钱涛 36e2f96ae5 社保方案起始缴纳和最后缴纳生效 2022-07-28 14:22:59 +08:00
钱涛 d1e6cec693 增加join 2022-07-28 14:17:30 +08:00
钱涛 259c40758f 1、薪资项目增加系统名 
2、薪资项目增加申报项目名
3、账套对应字段
 2022-07-27 16:56:13 +08:00
liuliang f74f70250d Merge branch 'develop' of https://gitee.com/qlmr/weaver-hrm-salary into develop 2022-07-27 09:29:26 +08:00
liuliang 12d6f733a6 工资单发放范围修正 2022-07-27 09:27:47 +08:00
钱涛 e7968f2545 1、公共枚举接口 
2、薪资档案封存标识
 2022-07-26 18:01:39 +08:00
liuliang 62d8e6589f liuliang 2022-07-26 16:19:13 +08:00
liuliang eb6f0b81ca 删除社保方案福利功能 2022-07-26 16:14:24 +08:00
钱涛 e01a575d58 初始化和调薪档案范围调整 2022-07-25 16:29:20 +08:00
钱涛 92e7ac17c1 档案状态 2022-07-25 15:56:21 +08:00
钱涛 db31190b9e 调整sql配置 2022-07-25 15:01:10 +08:00
liuliang 9602ed1d87 Merge branch 'feature_liuliang_20220720' into develop 2022-07-25 14:34:31 +08:00
liuliang c8ae60533e 导入修改 2022-07-25 14:33:35 +08:00
liuliang d26ded2261 Merge branch 'develop' of https://gitee.com/qlmr/weaver-hrm-salary into develop 2022-07-25 11:14:48 +08:00
liuliang 03c163bd91 Merge branch 'feature_liuliang_20220720' into develop 2022-07-25 11:14:24 +08:00
liuliang e03c24dfbf 社保福利导入 2022-07-25 11:13:18 +08:00
钱涛 eb957fbfec 修复档案初始化 2022-07-25 10:45:13 +08:00
liuliang 341b122fe7 导入可以带出数据功能 2022-07-25 09:57:15 +08:00
钱涛 3ced92cfc5 修复福利核算 2022-07-21 17:28:47 +08:00
钱涛 8e69159900 薪资档案代码合并 2022-07-21 10:51:38 +08:00
钱涛 b90953873c 薪资档案代码合并 2022-07-21 09:48:40 +08:00
钱涛 77ca4c2848 Merge branch 'develop' into feature/personIn2taxAgent 
# Conflicts:
#	src/com/engine/salary/service/SalaryArchiveService.java
#	src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
#	src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
 2022-07-21 09:43:02 +08:00
钱涛 a7b61dc7da 限制福利核算时的扣缴义务人 2022-07-20 18:01:00 +08:00
liuliang 4ff9290d73 Merge branch 'feature_liuliang_20220705' into develop 2022-07-20 16:06:27 +08:00
liuliang 32c15c1c35 Merge branch 'feature_liuliang_20220705' into develop 2022-07-20 15:58:49 +08:00
liuliang 71728b20e9 Merge branch 'feature_liuliang_20220718' into develop 2022-07-20 15:42:14 +08:00
liuliang 6b2c5ba314 社保福利台账重新核算 2022-07-20 15:40:51 +08:00
钱涛 967413827e 修改社保个人实际承担方为个人 2022-07-20 14:25:01 +08:00
钱涛 27c84676b7 修复工资单撤回 2022-07-20 11:50:09 +08:00
钱涛 d1770aadbb 薪资档案定薪调薪适配多个扣缴义务人 2022-07-19 18:40:41 +08:00
liuliang 6cda380aa2 Merge branch 'fix_liuliang_20220719' into develop 2022-07-19 14:23:08 +08:00
liuliang 76661474c4 修改社保福利台账导出按钮无法正确导出bug 2022-07-19 14:05:25 +08:00
钱涛 cd7684120b 福利核算 2022-07-19 11:36:19 +08:00
钱涛 f65f3c01eb 流程对接 2022-07-19 10:20:21 +08:00
钱涛 2275f53861 档案设置 2022-07-18 19:14:02 +08:00
钱涛 a721898d3d 薪资档案增加起始发薪和最后发薪 2022-07-18 18:08:59 +08:00
liuliang b9528442f9 薪酬档案导入对接流程-liuliang 2022-07-18 16:19:15 +08:00
钱涛 136641649d 薪资档案 2022-07-18 09:38:12 +08:00
钱涛 9dcebdc994 暂存 2022-07-15 10:15:59 +08:00
钱涛 92977e81c3 更新历史版本排序权重 2022-07-14 15:56:48 +08:00
钱涛 c8aa08fc9f 档案列表显示扣缴义务人 2022-07-14 14:32:59 +08:00
钱涛 01bd6fefd4 支持人员可在多个扣缴单位 2022-07-14 10:36:51 +08:00
liuliang 758a78996d 导入薪酬档案对接流程功能 2022-07-13 18:59:30 +08:00
钱涛 bb8c863bcc 薪酬报表与解密方法 2022-07-13 13:55:31 +08:00
钱涛 1d5c69278f 描述异常 2022-07-13 11:45:16 +08:00
钱涛 057ca97c9e 修复往期累计不显示的问题 2022-07-13 10:13:49 +08:00
钱涛 1d90bb148e 修复往期累计导入数量限制 2022-07-13 09:53:11 +08:00
钱涛 4258e7f545 薪酬版本功能 2022-07-12 17:42:33 +08:00
钱涛 c8d056ee2f 薪酬版本记录 2022-07-12 17:28:06 +08:00
钱涛 91f1fda342 核算档案项不可编辑 2022-07-11 18:24:12 +08:00
钱涛 bf31d993a7 薪酬报表-薪酬核算完成，将数据存储到非加密表，删除人员信息，补充：分部、部门、岗位等其他字段，供数据中心引用 2022-07-11 17:31:33 +08:00
钱涛 97763cc280 定时同步人员范围 2022-07-11 09:39:57 +08:00
钱涛 075f70b0fd 修复福利导入提示行号错误 2022-07-08 14:57:57 +08:00
钱涛 12917f4f8b 去除无用todo 2022-07-08 11:30:10 +08:00
钱涛 f3a216027f 修复福利台账的分权 2022-07-08 11:19:08 +08:00
钱涛 6967a7224c 优化往期删除逻辑 2022-07-07 20:26:43 +08:00
钱涛 eab3e9a6a9 1、福利列表显示扣税扣缴义务人 
2、导入限制
3、修改福利查询异常
4、核算人员范围限制
 2022-07-07 18:29:52 +08:00
钱涛 16c43f8679 考勤引用适配加班数据 2022-07-07 14:37:10 +08:00
钱涛 b23f790fc9 去除Spring注解 2022-07-06 17:36:30 +08:00
钱涛 24853722cb 1、去除@resource 2022-07-06 17:33:45 +08:00
钱涛 7301ee1033 1、福利档案限制缴纳组织必须为扣税扣缴义务人 
2、福利档案人员限制为个税扣缴义务人下
3、个税扣缴义务人单个申报
 2022-07-06 16:42:13 +08:00
钱涛 3c3c679757 获取个税扣缴义务人下的实际人员配置接口 2022-07-06 10:52:37 +08:00
钱涛 9bd1074258 1、档案限制应为个税扣缴义务人下的人员 
2、个税扣缴义务人未开启分权的情况下显示管理员
 2022-07-06 10:13:06 +08:00
钱涛 48d70400e5 薪资档案验证人员是否在义务扣缴人下 2022-07-05 19:19:17 +08:00
钱涛 053c436d49 获取薪酬版本信息 2022-07-05 16:56:09 +08:00
钱涛 190d6da1b2 操作实际管理的个税扣缴人 2022-07-05 15:31:18 +08:00
钱涛 d244883190 薪酬对外提供的解密方法 2022-07-05 15:08:59 +08:00
钱涛 03ba0418ab 福利核算精度异常 2022-07-05 15:04:00 +08:00
钱涛 47113434ad 薪酬报表 2022-07-04 19:21:44 +08:00
钱涛 4fe3a61d5d 修复核算工号不显示的问题 2022-07-04 18:58:49 +08:00
钱涛 c2c4149442 报表接口 2022-07-04 15:34:04 +08:00
钱涛 3f086e154d sql执行 2022-07-04 13:44:17 +08:00
钱涛 c372fff59c 系统异常处理 2022-07-01 15:18:29 +08:00
钱涛 6262aeeb01 1、合并计税处理 
2、考勤引用不生成空记录
 2022-06-30 16:15:19 +08:00
钱涛 7f7cdaf4a8 修复考勤引用删除适配问题 2022-06-30 14:21:29 +08:00
钱涛 317c04a121 公式编辑器，防止参数名和字段名呈现一对多的问题 2022-06-30 11:10:46 +08:00
钱涛 7b468045c8 1、限制核算的人员范围 
2、薪资工资单的导出功能
3、修复工资单批量发放和撤回的问题
4、核算时取各个扣缴义务人的数据
 2022-06-29 17:38:00 +08:00
钱涛 3e300e62eb 修复福利台账补缴功能异常 2022-06-29 14:13:23 +08:00
钱涛 f34eaa7c6f 修复福利台账总览数据 2022-06-28 18:21:44 +08:00
钱涛 4be0d70c4d fix 2022-06-28 16:46:42 +08:00
钱涛 63ce165a74 修复sql的XSS 2022-06-28 16:08:20 +08:00
钱涛 b64f34a14c 福利核算时只核算当前扣缴义务人的 2022-06-28 11:26:01 +08:00
钱涛 43175f6e40 处理福利带名字查询失败 2022-06-28 10:35:30 +08:00
钱涛 12fe1405ba 修复工资单导出 2022-06-27 18:34:41 +08:00
钱涛 75c84566b6 考勤导出自定义字段 2022-06-27 16:01:33 +08:00
钱涛 bcc44fe65e fix 2022-06-27 14:45:23 +08:00
钱涛 e7dc9e1a57 限制个税扣缴名字个备注字符数量 2022-06-27 13:17:15 +08:00
钱涛 7f3cc0a82a fix 2022-06-27 10:58:16 +08:00
钱涛 abdd87a005 fix 2022-06-24 18:05:08 +08:00
钱涛 3682ebd4f2 fix 2022-06-24 15:18:00 +08:00
钱涛 f680aa27d9 fix 2022-06-23 18:05:48 +08:00
钱涛 31a8b4bff9 fix 2022-06-23 17:15:39 +08:00
钱涛 b357bd18a6 fix 2022-06-23 14:08:55 +08:00
钱涛 e1a075cab3 fix 2022-06-22 19:26:05 +08:00
钱涛 15fbf8ac91 fix 2022-06-22 13:45:26 +08:00
钱涛 a577645329 fix 2022-06-22 10:58:18 +08:00
钱涛 fc35eff75d fix 2022-06-21 22:37:22 +08:00
钱涛 e1629a021e oracle错误和薪资项目错误 2022-06-21 15:08:23 +08:00
钱涛 ff88b1f9ca 员工字段不可重复 2022-06-21 11:38:55 +08:00
钱涛 3363120c44 修复核算分权的问题 2022-06-20 19:39:01 +08:00
钱涛 5cea57d477 fix bug 2022-06-17 17:22:48 +08:00
MustangDeng c701314f15 fix bug 福利方案删除多余的编辑 2022-06-16 22:09:50 +08:00
MustangDeng e49f68b842 fix bug 45 2022-06-16 21:04:06 +08:00
钱涛 dfe8fdf57c fixbug 2022-06-16 19:06:45 +08:00
钱涛 035503f26c fixbug 2022-06-16 17:55:26 +08:00
钱涛 5396d7bee3 加解密 2022-06-16 14:22:01 +08:00
钱涛 3e93a85873 Merge branch 'feature/authitem' into release 2022-06-16 14:21:38 +08:00
钱涛 b5871e1ea9 权限项 2022-06-16 14:13:22 +08:00
MustangDeng f51a4e4fd7 加解密 2022-06-16 11:30:28 +08:00
MustangDeng 9042a9bbed 加解密 2022-06-16 11:01:03 +08:00
MustangDeng bd99d3ccf8 加解密问题 2022-06-16 10:31:11 +08:00
MustangDeng fc3cbe8111 Merge remote-tracking branch 'origin/release' into release 2022-06-16 10:24:58 +08:00
MustangDeng 2badaab552 加解密问题 2022-06-16 10:24:43 +08:00
钱涛 17dbef3ef2 sql 2022-06-15 17:53:12 +08:00
MustangDeng 3c13b90a4d Merge remote-tracking branch 'origin/release' into release 2022-06-15 17:04:03 +08:00
MustangDeng 62054871ce 发送工资单 2022-06-15 17:03:48 +08:00
钱涛 2731e4eddd sql 2022-06-15 16:31:40 +08:00
钱涛 455ff23134 申报表导出修改 2022-06-15 16:02:34 +08:00
钱涛 f5b8806eff 账套 2022-06-15 15:27:23 +08:00
钱涛 b42586600a fix申报表 2022-06-15 12:03:17 +08:00
钱涛 baa06f4011 Merge remote-tracking branch 'origin/release' into release 2022-06-15 11:02:55 +08:00
钱涛 cfe2d3c1dc fix申报表 2022-06-15 11:02:44 +08:00
MustangDeng 0e0cc9f97b 福利档案列表 2022-06-15 11:01:09 +08:00
钱涛 fda668ba90 Merge remote-tracking branch 'origin/release' into release 2022-06-15 10:24:54 +08:00
钱涛 7955d67da6 fix申报表 2022-06-15 10:24:46 +08:00
MustangDeng d5228ff1bf 福利档案列表 2022-06-15 10:23:39 +08:00
钱涛 8d6a3c41d7 fix人员同步 2022-06-15 09:29:43 +08:00
钱涛 5634377e47 Merge remote-tracking branch 'origin/release' into release 2022-06-14 16:05:58 +08:00
钱涛 0e8c916262 保存 2022-06-14 16:05:47 +08:00
MustangDeng 8846346dda 台账核算回滚数据 2022-06-14 16:05:23 +08:00
钱涛 811a90f50d 账套项目的顺序性 2022-06-14 11:13:31 +08:00
钱涛 bf7d8dd634 导入时人员唯一校验 2022-06-13 17:05:36 +08:00
钱涛 b78e96c875 考勤列表适配sqlserver 2022-06-13 15:37:52 +08:00
钱涛 081747b334 考勤引用修复 2022-06-13 10:52:32 +08:00
钱涛 1aee6f7ef0 往期累计 2022-06-10 18:16:11 +08:00
钱涛 99e7c1eaef Merge remote-tracking branch 'origin/release' into release 2022-06-10 18:07:36 +08:00
钱涛 33914eae1d 解密 2022-06-10 18:07:25 +08:00
MustangDeng 3bedc88f44 福利加解密 2022-06-10 18:01:55 +08:00
MustangDeng fcb55bc269 fix 冲突 2022-06-10 17:15:19 +08:00
钱涛 df7e3febc3 冲突 2022-06-10 17:03:25 +08:00
钱涛 e6c6b8eb57 Merge branch 'auth-fl' into release 
# Conflicts:
#	resource/sql/分权.sql
#	src/com/engine/salary/biz/SIAccountBiz.java
#	src/com/engine/salary/mapper/taxagent/TaxAgentMapper.xml
#	src/com/engine/salary/service/impl/SIAccountServiceImpl.java
#	src/com/engine/salary/service/impl/SIExportServiceImpl.java
 2022-06-10 16:58:45 +08:00
钱涛 6ddf483767 加解密 2022-06-10 16:43:38 +08:00
MustangDeng 9315882742 福利档案列表log 2022-06-10 16:35:01 +08:00
钱涛 e83714ba4f Merge branch 'feature/encrypt' into release 
# Conflicts:
#	src/com/engine/salary/biz/AddUpSituationBiz.java
#	src/com/engine/salary/biz/SIArchivesBiz.java
#	src/com/engine/salary/cmd/datacollection/OtherDeductionGetDetailListCmd.java
#	src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java
#	src/com/engine/salary/entity/datacollection/dto/AddUpDeductionRecordDTO.java
#	src/com/engine/salary/entity/datacollection/dto/AddUpSituationDTO.java
#	src/com/engine/salary/entity/datacollection/dto/AddUpSituationRecordDTO.java
#	src/com/engine/salary/entity/datacollection/dto/OtherDeductionListDTO.java
#	src/com/engine/salary/entity/datacollection/dto/OtherDeductionRecordDTO.java
#	src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java
#	src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
#	src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
#	src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java
#	src/com/engine/salary/service/impl/SISchemeServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryComparisonResultServiceImpl.java
#	src/com/engine/salary/service/impl/TaxAgentServiceImpl.java
#	src/com/engine/salary/service/impl/TaxDeclarationDetailServiceImpl.java
#	src/com/engine/salary/wrapper/TaxDeclarationWrapper.java
 2022-06-10 15:26:43 +08:00