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