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 |