 钱涛
|
fefc6301b3
|
二开，调整附表传值策略
|
2025-01-07 11:27:20 +08:00 |
|
钱涛
|
e726cb10b9
|
Merge branch 'release/个税版本' into custom/艾志工业
|
2025-01-07 11:22:11 +08:00 |
|
钱涛
|
60fcb403db
|
Merge branch 'feature/减免附表' into release/个税版本
|
2025-01-06 17:45:13 +08:00 |
|
钱涛
|
8a49ea89f8
|
增加申报表导入时导出现有数据选项
|
2025-01-06 16:55:52 +08:00 |
|
钱涛
|
483c368732
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2025-01-06 11:30:23 +08:00 |
|
钱涛
|
5ec4fc3516
|
申报表查看附表
|
2025-01-03 17:38:47 +08:00 |
|
钱涛
|
5a0ef67816
|
版本
|
2025-01-03 09:14:08 +08:00 |
|
钱涛
|
4df0f90f79
|
Merge branch 'release/2.18.2.2412.02' into release/个税版本
|
2025-01-03 09:11:38 +08:00 |
|
钱涛
|
8f697eba36
|
版本
|
2025-01-02 15:00:21 +08:00 |
Harryxzy
|
97033189a4
|
艾志建模标识更新修复
|
2024-12-30 15:37:51 +08:00 |
|
钱涛
|
e23c4d08cc
|
修复其他免税编辑功能
|
2024-12-27 15:46:22 +08:00 |
|
钱涛
|
5946ea6985
|
修复其他免税编辑功能
|
2024-12-27 15:38:00 +08:00 |
|
钱涛
|
d096597a0a
|
申报添加附表
|
2024-12-26 18:56:33 +08:00 |
|
钱涛
|
39c536c7b4
|
申报功能
|
2024-12-26 15:16:24 +08:00 |
|
钱涛
|
5b241cda49
|
导入功能
|
2024-12-25 16:42:27 +08:00 |
|
钱涛
|
18bd6509db
|
导入功能
|
2024-12-25 16:28:21 +08:00 |
|
Harryxzy
|
d4a42e0ed6
|
修复人员确认页面“环比上月减少人员”搜索后，显示数据错误
|
2024-12-25 11:27:06 +08:00 |
|
钱涛
|
2e4c3ddaff
|
删除接口
|
2024-12-25 10:36:37 +08:00 |
|
钱涛
|
9c99e53288
|
列表和保存接口
|
2024-12-24 15:52:36 +08:00 |
|
Harryxzy
|
bbb02bcd81
|
fix 报表按照分部维度错误
fix 调薪记录导入生效日期格式错误
|
2024-12-24 15:39:58 +08:00 |
|
钱涛
|
412d3488d1
|
减免税额列表和保存接口
|
2024-12-24 10:54:57 +08:00 |
|
钱涛
|
cf253ecfb0
|
个人养老金附表
|
2024-12-23 16:41:42 +08:00 |
|
钱涛
|
090331e5b1
|
Merge branch 'release/个税版本' into feature/减免附表
|
2024-12-20 16:44:55 +08:00 |
|
钱涛
|
c415cc7f25
|
Merge branch 'release/2.18.2.2412.02' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
|
2024-12-20 16:41:08 +08:00 |
|
Harryxzy
|
7b82b570e4
|
获取token增加https配置
|
2024-12-19 16:59:38 +08:00 |
|
Harryxzy
|
fda791624e
|
获取token增加https配置
|
2024-12-19 16:34:32 +08:00 |
|
钱涛
|
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 |
|
钱涛
|
bf8f55aaa9
|
是否引用班次给出按钮选择
|
2024-12-17 15:47:49 +08:00 |
|
钱涛
|
10266bf739
|
处理离职员工无法导入问题
|
2024-12-17 15:00:41 +08:00 |
|
钱涛
|
d14ac4bda3
|
免税收入附表
|
2024-12-17 14:05:05 +08:00 |
|
钱涛
|
8c83e8ed6c
|
新增免税收入、商业健康保险、税延养老保险、准予扣除的捐赠额、减免税额、其他附表
|
2024-12-16 17:48:03 +08:00 |
|
Harryxzy
|
94da3d3a31
|
修复报表导出，单元格格式问题
|
2024-12-16 17:46:58 +08:00 |
|
钱涛
|
4d90d0d8f0
|
支持主账号查看次账号工资单
|
2024-12-16 10:38:08 +08:00 |
|
Harryxzy
|
ec88fc5b10
|
修复基数没有自动调整 日志调整
|
2024-12-13 16:29:24 +08:00 |
|
Harryxzy
|
874de98a91
|
修复基数没有自动调整
|
2024-12-13 16:19:56 +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 |
|
Harryxzy
|
66912f62a4
|
社保基数自动调整 增加日志
|
2024-12-12 16:16:18 +08:00 |
|
Harryxzy
|
3d04414511
|
Merge remote-tracking branch 'origin/release/2.18.1.2412.01' into release/2.18.1.2412.01
|
2024-12-12 15:30:55 +08:00 |
|
Harryxzy
|
19a4385703
|
社保基数自动调整 增加日志
|
2024-12-12 15:30:26 +08:00 |
|
钱涛
|
83df05b763
|
控制下账号类型显示隐藏
|
2024-12-12 10:18:07 +08:00 |
|
Harryxzy
|
4ddb123b3d
|
移动端获取工资单列表优化
|
2024-12-11 15:22:08 +08:00 |
|
钱涛
|
b373f062c7
|
处理冲突
|
2024-12-11 11:07:36 +08:00 |
|
钱涛
|
bd3b815bcf
|
隐藏项目导入导出不显示
|
2024-12-11 11:04:42 +08:00 |
|
钱涛
|
b8fdc4dde6
|
隐藏项目导入导出不显示
|
2024-12-10 16:25:20 +08:00 |
|
Harryxzy
|
b769e762ca
|
社保福利台账非系统人员
|
2024-12-10 11:50:20 +08:00 |
|
Harryxzy
|
1715b58bad
|
社保福利台账进度条优化
|
2024-12-10 11:00:05 +08:00 |