Commit Graph

2155 Commits

Author SHA1 Message Date
钱涛 18bd6509db 导入功能 2024-12-25 16:28:21 +08:00
钱涛 2e4c3ddaff 删除接口 2024-12-25 10:36:37 +08:00
钱涛 9c99e53288 列表和保存接口 2024-12-24 15:52:36 +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
钱涛 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
钱涛 10266bf739 处理离职员工无法导入问题 2024-12-17 15:00:41 +08:00
钱涛 d14ac4bda3 免税收入附表 2024-12-17 14:05:05 +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
Harryxzy 66912f62a4 社保基数自动调整 增加日志 2024-12-12 16:16:18 +08:00
Harryxzy 19a4385703 社保基数自动调整 增加日志 2024-12-12 15:30:26 +08:00
Harryxzy 4ddb123b3d 移动端获取工资单列表优化 2024-12-11 15:22:08 +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
钱涛 89ca47d65e 进度条问题 2024-12-10 09:12:35 +08:00
Harryxzy 77f7640a24 社保台账进度条key增加义务人id 2024-12-09 17:13:29 +08:00
Harryxzy 3fa6205c11 Merge remote-tracking branch 'origin/release/2.18.1.2412.01' into release/2.18.1.2412.01 2024-12-09 14:35:15 +08:00
Harryxzy d52e13f09e 薪资明细报表增加证件号码 2024-12-09 14:34:57 +08:00
钱涛 7c1e314f2c 保存核算人员时增加快照数据 2024-12-09 14:20:52 +08:00
钱涛 4100ba1331 保存核算人员时增加快照数据 2024-12-09 13:21:25 +08:00
钱涛 0b6a832c4f 组织信息替换 2024-12-06 16:05:51 +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
钱涛 ec0e74a8eb 系统模板bug修改 2024-12-05 10:26:37 +08:00
钱涛 5fedafc67e 系统模板配置 2024-12-05 10:17:12 +08:00
钱涛 0114bdeb3f 系统模板配置 2024-12-04 17:45:56 +08:00
钱涛 f000148af7 Merge branch 'feature/薪资报表明细页面配置' into release/2.17.1.2411.01 2024-12-04 15:54:04 +08:00
钱涛 85e3d414fe 查询组织信息快照 2024-12-04 15:41:11 +08:00
钱涛 051a38d408 社保和薪资档案支持定时任务增员 2024-12-04 11:46:00 +08:00
钱涛 3e3350bcd6 删除模板功能 2024-12-04 10:14:39 +08:00
钱涛 c80d900339 模板管理列表 2024-12-04 09:13:41 +08:00
钱涛 3d61bfa9a6 薪资报表明细显示定制列配置 2024-12-03 10:45:03 +08:00
钱涛 09b5dee199 模板权限 2024-12-02 15:01:06 +08:00
钱涛 5d458356a5 Merge remote-tracking branch 'origin/release/2.17.1.2411.01' into release/2.17.1.2411.01 2024-11-26 13:50:20 +08:00
钱涛 79ed6a3226 定制列恢复默认设置 2024-11-26 13:50:10 +08:00
Harryxzy 607fd2c6a2 Merge remote-tracking branch 'origin/release/2.17.1.2411.01' into release/2.17.1.2411.01 2024-11-26 13:30:04 +08:00
钱涛 12df33960a 修改默认列设置功能 2024-11-25 18:05:18 +08:00
钱涛 de5a00f588 修改默认列设置功能 2024-11-25 16:04:19 +08:00
Harryxzy 04fb5edade 浮动薪酬字符、数值限制 2024-11-20 11:28:14 +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