 钱涛
|
d1a4b83f33
|
健康保险附表
|
2024-12-19 11:23:59 +08:00 |
|
钱涛
|
e6f8b31f69
|
延税养老保险附表
|
2024-12-19 10:57:21 +08:00 |
|
钱涛
|
fe8910f2c5
|
减免税额附表
|
2024-12-19 10:46:04 +08:00 |
|
钱涛
|
4a9a001311
|
几个附表列表
|
2024-12-19 09:53:56 +08:00 |
|
钱涛
|
d14ac4bda3
|
免税收入附表
|
2024-12-17 14:05:05 +08:00 |
|
钱涛
|
8c83e8ed6c
|
新增免税收入、商业健康保险、税延养老保险、准予扣除的捐赠额、减免税额、其他附表
|
2024-12-16 17:48:03 +08:00 |
|
钱涛
|
7243eece3d
|
Merge branch 'release/2.18.1.2412.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/SalaryEmployeeService.java
|
2024-12-13 13:53:00 +08:00 |
|
钱涛
|
c13cc9d0a2
|
处理薪资档案问题
|
2024-12-12 18:24:00 +08:00 |
|
钱涛
|
83df05b763
|
控制下账号类型显示隐藏
|
2024-12-12 10:18:07 +08:00 |
Harryxzy
|
4ddb123b3d
|
移动端获取工资单列表优化
|
2024-12-11 15:22:08 +08:00 |
|
钱涛
|
bd3b815bcf
|
隐藏项目导入导出不显示
|
2024-12-11 11:04:42 +08:00 |
|
钱涛
|
4100ba1331
|
保存核算人员时增加快照数据
|
2024-12-09 13:21:25 +08:00 |
|
Harryxzy
|
7d346aa4b0
|
fix非系统人员导入薪资档案时，employeetype为null
|
2024-12-06 16:33:52 +08:00 |
|
钱涛
|
5b8562edb6
|
组织快照
|
2024-12-06 16:00:53 +08:00 |
|
钱涛
|
de5af5f2c9
|
组织快照
|
2024-12-06 16:00:05 +08:00 |
|
钱涛
|
dff42953b5
|
Merge branch 'release/2.17.1.2411.01' into feature/组织快照
|
2024-12-05 15:21:28 +08:00 |
|
钱涛
|
f94ab9c3be
|
Merge branch 'release/2.17.1.2411.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/wrapper/SalaryCommonWrapper.java
|
2024-12-05 10:52:08 +08:00 |
|
钱涛
|
5fedafc67e
|
系统模板配置
|
2024-12-05 10:17:12 +08:00 |
|
钱涛
|
0114bdeb3f
|
系统模板配置
|
2024-12-04 17:45:56 +08:00 |
|
钱涛
|
3e3350bcd6
|
删除模板功能
|
2024-12-04 10:14:39 +08:00 |
|
钱涛
|
c80d900339
|
模板管理列表
|
2024-12-04 09:13:41 +08:00 |
|
钱涛
|
c3b71201a4
|
组织快照
|
2024-12-03 16:39:02 +08:00 |
|
钱涛
|
3d61bfa9a6
|
薪资报表明细显示定制列配置
|
2024-12-03 10:45:03 +08:00 |
|
钱涛
|
79ed6a3226
|
定制列恢复默认设置
|
2024-11-26 13:50:10 +08:00 |
|
钱涛
|
de5a00f588
|
修改默认列设置功能
|
2024-11-25 16:04:19 +08:00 |
|
钱涛
|
199fe67374
|
适配港澳台通行证
|
2024-11-19 16:44:08 +08:00 |
|
钱涛
|
ce098fcd89
|
Merge branch 'release/2.17.1.2411.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/SalarySobServiceImpl.java
# src/com/engine/salary/web/SalarySobController.java
# src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java
# src/com/engine/salary/wrapper/SalarySobItemWrapper.java
|
2024-11-19 13:29:22 +08:00 |
|
钱涛
|
618dbd17d8
|
fix默认值列表重复bug
|
2024-11-19 09:48:13 +08:00 |
|
Harryxzy
|
8a06eaad93
|
Merge branch 'feature/工资单审批' into release/2.17.1.2411.01
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobServiceImpl.java
# src/com/engine/salary/sys/constant/SalarySysConstant.java
# src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
# src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java
|
2024-11-13 18:36:20 +08:00 |
|
钱涛
|
158e7dd20c
|
Merge branch 'feature/次账号' into release/2.17.1.2411.01
# Conflicts:
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
# src/com/engine/salary/sys/constant/SalarySysConstant.java
|
2024-11-12 18:05:42 +08:00 |
|
钱涛
|
af7d51ac79
|
Merge branch 'release/2.16.1.2410.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
# src/com/engine/salary/web/SalaryCommonController.java
# src/com/engine/salary/wrapper/SalaryCommonWrapper.java
|
2024-11-12 18:01:22 +08:00 |
|
Harryxzy
|
ce1312d605
|
修复没有档案的人，定薪action状态保持不变
|
2024-11-12 17:08:59 +08:00 |
|
Harryxzy
|
5a18ccf57b
|
修复没有档案的人，定薪action状态保持不变
|
2024-11-12 17:06:41 +08:00 |
|
钱涛
|
0e3a5320a4
|
新增核算结果状态编码
|
2024-11-12 11:31:47 +08:00 |
|
Harryxzy
|
11f2591797
|
Merge branch 'feature/241101-定薪action支持不设为发薪人员' into release/2.16.1.2410.01
|
2024-11-08 16:30:53 +08:00 |
|
Harryxzy
|
32eabb25f0
|
Merge branch 'feature/241101_薪资档案增加调薪筛选' into release/2.16.1.2410.01
|
2024-11-08 16:30:40 +08:00 |
|
Harryxzy
|
a2f8803e76
|
薪资档案增加调薪时间 筛选
|
2024-11-08 16:08:49 +08:00 |
|
钱涛
|
e537ffaa5a
|
薪资明细显示模板
|
2024-11-07 17:45:17 +08:00 |
|
Harryxzy
|
5953c2b938
|
薪酬token加解密
|
2024-11-06 13:37:03 +08:00 |
|
Harryxzy
|
dbb332e07f
|
Merge branch 'release/2.16.1.2410.01' into fix/240901_token加解密
|
2024-11-06 10:05:53 +08:00 |
|
Harryxzy
|
13012b739e
|
定薪action支持配置留在待定薪
|
2024-11-05 16:22:48 +08:00 |
|
钱涛
|
4cd0fbfe30
|
报表模板
|
2024-11-04 19:49:46 +08:00 |
|
Harryxzy
|
07c0492ec2
|
Merge branch 'release/2.16.1.2410.01' into feature/次账号
|
2024-11-04 17:29:32 +08:00 |
|
钱涛
|
e3d5ca78f4
|
修改账套状态类型
|
2024-11-04 10:53:21 +08:00 |
|
Harryxzy
|
989468cdc7
|
Merge branch 'feature/241001-社保台账人员信息快照' into release/2.16.1.2410.01
|
2024-11-01 14:33:14 +08:00 |
|
钱涛
|
7fd0f95802
|
扣缴义务人和账套的人员的人员状态
|
2024-11-01 14:27:47 +08:00 |
|
钱涛
|
391fa6ebd9
|
扣缴义务人和账套的人员的人员状态
|
2024-11-01 10:04:15 +08:00 |
|
钱涛
|
ad48063ca9
|
扣缴义务人和账套的人员范围支持编辑
|
2024-10-31 16:56:32 +08:00 |
|
钱涛
|
d21258596a
|
扣缴义务人新加入人员，不会修改历史档案
|
2024-10-30 17:10:32 +08:00 |
|
钱涛
|
aebe8c59f8
|
Merge branch 'release/2.16.1.2410.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.java
# src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.xml
# src/com/engine/salary/service/SalaryAcctRecordService.java
# src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
|
2024-10-28 13:40:56 +08:00 |