Commit Graph

1233 Commits

Author SHA1 Message Date
Harryxzy a8b2c7e8e9 杭州五院分段计算 2025-05-19 15:05:31 +08:00
Harryxzy 2ae00ca581 五院分段计算 2025-05-15 13:49:16 +08:00
Harryxzy d93236c0c0 五院
1、调薪流程、拆分逻辑
 2、审批流程
 3、工资报表
 4、工资差异报表
 5、增加转正日期
2025-05-07 11:35:11 +08:00
钱涛 99f6c43f25 Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
# Conflicts:
#	src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
2025-04-24 16:04:13 +08:00
钱涛 22f494fe12 修复按照扣缴义务人名称检索 2025-04-24 16:02:34 +08:00
钱涛 2fe958f5db Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
# Conflicts:
#	src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
2025-04-23 17:42:08 +08:00
钱涛 7a7030a91c 申报表税款所属期检索和申报 2025-04-23 17:39:30 +08:00
钱涛 6e6606f3ac Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01 2025-04-21 15:49:39 +08:00
钱涛 552cee8a6f 修复合并计税问题 2025-04-21 15:49:28 +08:00
钱涛 0e93cbab04 t 2025-04-21 10:37:44 +08:00
钱涛 083f266a85 Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01 2025-04-17 14:24:23 +08:00
钱涛 d01c9bf06f 增加扣缴义务人搜索核算列表 2025-04-17 11:06:02 +08:00
钱涛 61beec603e 创建推送记录接口;
推送接口;
撤回接口;
2025-04-14 17:00:16 +08:00
钱涛 c04dad0c4d 修改字段名 2025-04-09 14:23:38 +08:00
钱涛 f4c025e078 数据推送 2025-04-07 09:19:47 +08:00
钱涛 d4f45d5eb3 扩展排序字段 2025-04-03 10:49:10 +08:00
钱涛 0a78f17230 记录推送耗时 2025-04-02 17:05:04 +08:00
钱涛 ba650b9fe6 推送记录状态变更;
推送明细状态变更;
2025-04-02 14:59:32 +08:00
钱涛 0777f99870 创建推送记录接口;
重推接口;
2025-04-01 17:35:29 +08:00
钱涛 77df0f4c58 Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2503.01 2025-03-24 15:03:27 +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
钱涛 ccb0dcd8d5 修复数值类型判断 2025-03-13 16:02:00 +08:00
钱涛 165a775074 刷新账套和扣缴义务人自关联 2025-03-05 16:42:13 +08:00
钱涛 1b77352301 处理冲突,禁用map 2025-02-27 10:29:11 +08:00
钱涛 291cd426fe 公式变量支持获取上月数据 2025-02-17 15:54:35 +08:00
钱涛 a688ca8b52 业务线分权;
调薪记录多语言;
2025-02-13 14:23:58 +08:00
钱涛 c0dbce4786 业务线分权 2025-02-13 11:27:13 +08:00
钱涛 f2b71b1c38 Merge branch 'release/2.19.1.2501.01' into feature/数据推送
# Conflicts:
#	src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
2025-02-08 09:59:44 +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
钱涛 36a92fee91 Merge branch 'feature/权限' into feature/数据推送 2025-02-05 16:04:30 +08:00
钱涛 74bb4beffc 修复业务线核算不了社保 2025-02-05 16:00:52 +08:00
钱涛 35aff0431e Merge branch 'release/2.18.2.2412.02' into feature/数据推送
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
#	src/com/engine/salary/service/impl/SalarySendServiceImpl.java
2024-12-27 09:24:22 +08:00
钱涛 9b9c169246 Merge branch 'release/2.18.1.2412.01' into feature/权限
# Conflicts:
#	src/com/engine/salary/service/impl/SalarySendServiceImpl.java
2024-12-17 16:27:46 +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
钱涛 36de3feeed Merge branch 'release/2.18.1.2412.01' into feature/权限
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
2024-12-10 14:14:28 +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