 钱涛
|
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 |