Harryxzy
|
ebec70ddeb
|
领悦显示调整
|
2025-03-06 11:39:14 +08:00 |
|
Harryxzy
|
6119e933d5
|
领悦 凭证二开
|
2025-02-21 16:50:16 +08:00 |
|
Harryxzy
|
35551d09a5
|
Merge branch 'release/3.0.0.2502.01' into custom/领悦业务线
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
|
2025-02-19 10:49:43 +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 |
|
Harryxzy
|
43875578a4
|
领悦调整
|
2025-01-24 13:53:31 +08:00 |
|
Harryxzy
|
d6713473ed
|
领悦业务线
|
2025-01-22 15:54:24 +08:00 |
|
Harryxzy
|
c217631018
|
领悦
|
2025-01-17 18:44:17 +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 |
|
钱涛
|
851921dedd
|
Merge branch 'release/2.18.1.2412.01' into custom/领悦业务线
# Conflicts:
# src/com/engine/salary/remote/attend/service/impl/RemoteAttend4SalaryServiceImpl.java
# src/com/engine/salary/service/SalaryEmployeeService.java
# src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
# src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
|
2024-12-17 16:07:01 +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 |
|
钱涛
|
c80d900339
|
模板管理列表
|
2024-12-04 09:13:41 +08:00 |
|
钱涛
|
c3b71201a4
|
组织快照
|
2024-12-03 16:39:02 +08:00 |
|
钱涛
|
a342673ffb
|
Merge branch 'feature/权限' into custom/领悦业务线
# Conflicts:
# src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
|
2024-12-03 12:20:41 +08:00 |
|
钱涛
|
583f3fa85a
|
Merge branch 'release/2.17.1.2411.01' into feature/权限
# Conflicts:
# src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobServiceImpl.java
# src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
|
2024-12-03 12:14:25 +08:00 |
|
钱涛
|
3d61bfa9a6
|
薪资报表明细显示定制列配置
|
2024-12-03 10:45:03 +08:00 |
|
钱涛
|
186473f9f6
|
数据推送服务
|
2024-12-02 14:08:03 +08:00 |
|
钱涛
|
ff3d569e1d
|
数据推送列表和明细列表
|
2024-11-29 09:14:04 +08:00 |
|
钱涛
|
17ceeef74d
|
数据推送明细状态
|
2024-11-28 15:30:36 +08:00 |
|
钱涛
|
3ba1ea6cc7
|
推送记录状态
|
2024-11-28 09:41:10 +08:00 |
|
钱涛
|
94da757524
|
Merge branch 'release/2.17.1.2411.01' into feature/数据推送
# Conflicts:
# src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
|
2024-11-26 14:21:02 +08:00 |
|
钱涛
|
79ed6a3226
|
定制列恢复默认设置
|
2024-11-26 13:50:10 +08:00 |
|
钱涛
|
de5a00f588
|
修改默认列设置功能
|
2024-11-25 16:04:19 +08:00 |
|
钱涛
|
119d9f3cd8
|
推送日志功能
|
2024-11-21 11:54:47 +08:00 |
|
钱涛
|
2fe7b7dc03
|
Merge branch 'release/2.17.1.2411.01' into feature/数据推送
|
2024-11-20 18:43:59 +08:00 |
|
钱涛
|
dd77a2f11b
|
数据推送
|
2024-11-20 17:03:41 +08:00 |
|
钱涛
|
e4e3fb4bec
|
数据推送
|
2024-11-19 19:34:41 +08:00 |
|
钱涛
|
618dbd17d8
|
fix默认值列表重复bug
|
2024-11-19 09:48:13 +08:00 |
|
钱涛
|
9eb6a83f7b
|
数据推送列表
|
2024-11-19 09:37:43 +08:00 |