Commit Graph

1117 Commits

Author SHA1 Message Date
钱涛 7a7030a91c 申报表税款所属期检索和申报 2025-04-23 17:39:30 +08:00
钱涛 552cee8a6f 修复合并计税问题 2025-04-21 15:49:28 +08:00
钱涛 0e93cbab04 t 2025-04-21 10:37:44 +08:00
钱涛 d01c9bf06f 增加扣缴义务人搜索核算列表 2025-04-17 11:06:02 +08:00
钱涛 eea9093cfd Merge branch 'release/2.17.1.2411.01' into release/2.19.1.2501.01 2025-03-24 15:03:09 +08:00
钱涛 b128f219f7 处理敏感信息泄露 2025-03-24 14:57:00 +08:00
钱涛 0988dd6d5a 下载excel模板示例 2025-02-08 09:52:32 +08:00
钱涛 5916cd63ef 支持根据税款所属期进行申报 2025-02-07 16:58:58 +08:00
钱涛 8425a30aa0 模板显示附件名称 2025-02-07 10:13:29 +08:00
钱涛 0dd98cf616 薪资excel模板导出 2025-02-06 16:11:39 +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
钱涛 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
钱涛 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
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
钱涛 bfbd9e4b40 修复人员报表排序 2024-10-28 11:35:57 +08:00
钱涛 71569cad9e 薪资所属年变量 2024-10-25 16:01:45 +08:00