 钱涛
|
d52e146001
|
在线算税时校验人员是否已报送
|
2024-06-19 09:53:46 +08:00 |
|
钱涛
|
3e11d7240b
|
Merge branch 'release/个税版本' into feature/在线算税
|
2024-06-06 15:56:37 +08:00 |
|
钱涛
|
e1e00f4db0
|
在线算税v1
|
2024-06-06 13:51:33 +08:00 |
|
钱涛
|
572b114f28
|
Merge branch 'release/2.14.3.2406.01' into release/个税版本2.14.3.2406.01
# Conflicts:
# src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml
# src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
|
2024-06-03 11:18:01 +08:00 |
|
钱涛
|
2c79afa65e
|
锁定人员
|
2024-05-28 17:29:18 +08:00 |
|
钱涛
|
ec5463c050
|
Merge branch 'release/2.14.2.2405.02' into release/个税版本
# Conflicts:
# src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml
# src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
|
2024-05-27 10:37:39 +08:00 |
|
钱涛
|
3428de9e33
|
账套快照
|
2024-05-06 16:03:29 +08:00 |
Harryxzy
|
a9dd2c2cb3
|
Merge branch 'release/2.12.1.2403.02' into release/个税版本
|
2024-04-08 15:53:13 +08:00 |
|
Harryxzy
|
7557c1b330
|
薪资核算导出模板优化
|
2024-03-29 15:45:45 +08:00 |
|
Harryxzy
|
582abc061a
|
薪资核算导出模板
|
2024-03-29 10:46:51 +08:00 |
|
Harryxzy
|
0d6bf4dfe3
|
薪资核算导出模板修复
|
2024-03-28 18:28:22 +08:00 |
|
Harryxzy
|
130be31d99
|
薪资核算导出模板
|
2024-03-27 11:33:56 +08:00 |
|
Harryxzy
|
1c40ed0ecd
|
薪资核算导出模板
|
2024-03-26 17:04:56 +08:00 |
|
钱涛
|
4846cfcf18
|
Merge branch 'release/2.9.10.2312.02' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
|
2024-01-17 14:14:32 +08:00 |
|
Harryxzy
|
d6705e8917
|
产品-批量编辑
|
2023-12-11 13:09:20 +08:00 |
|
Harryxzy
|
2b6b1ef2c4
|
Merge branch 'custom/鲁控数字' into feature/231202-批量编辑
|
2023-12-11 11:36:59 +08:00 |
|
Harryxzy
|
419baeb8cd
|
鲁控数字
|
2023-12-06 16:05:08 +08:00 |
|
钱涛
|
791bc2ffca
|
Merge branch 'release/2.9.9.2312.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/SalaryArchiveService.java
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
|
2023-12-05 15:09:40 +08:00 |
|
Harryxzy
|
4eb931686e
|
鲁控数字temp
|
2023-12-05 14:57:34 +08:00 |
|
Harryxzy
|
97a5d4ab91
|
线下对比表头改造成分组的样式
|
2023-11-15 17:12:52 +08:00 |
|
钱涛
|
2f59f8283a
|
人员报送接口
|
2023-08-20 14:03:43 +08:00 |
sy
|
4b503513f2
|
Merge remote-tracking branch 'remotes/origin/release/2.9.2.2307.02' into feature/230701-薪资核算-导出功能可选择字段导出
|
2023-07-19 10:04:58 +08:00 |
|
sy
|
b007b1b351
|
薪酬系统-薪资核算，自定义导出字段
|
2023-07-13 14:43:54 +08:00 |
|
sy
|
c78c8375f0
|
薪酬系统-薪资核算，自定义导出字段
|
2023-07-12 15:20:02 +08:00 |
|
sy
|
b705161492
|
薪酬系统-薪资核算、薪资档案、福利档案，高级搜索功能问题修复
|
2023-07-10 14:33:43 +08:00 |
|
sy
|
b92c7ff599
|
薪酬系统-薪资核算、薪资档案、福利档案，高级搜索中的状态条件改为数组类型的入参
|
2023-07-07 15:32:12 +08:00 |
|
sy
|
fa28db9c79
|
薪酬系统-薪资核算，高级搜索和导出带入筛选条件未生效问题修复
|
2023-07-07 10:15:23 +08:00 |
|
Harryxzy
|
822ad87451
|
薪资核算结果校验拦截
|
2023-06-27 14:58:33 +08:00 |
|
钱涛
|
c87db92ee8
|
公式扩展核算基本信息和核算日期
|
2023-05-10 14:26:39 +08:00 |
|
钱涛
|
a19b19e23d
|
公式
|
2023-04-19 10:15:01 +08:00 |
|
sy
|
521db08cde
|
Merge remote-tracking branch 'remotes/origin/feature/v4-salaryExcelFormat-0328' into release/2.7.3.2304.01
# Conflicts:
# src/com/engine/salary/service/SalaryAcctExcelService.java
# src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
|
2023-04-03 15:59:58 +08:00 |
|
Harryxzy
|
3304ffdbd5
|
薪资核算导入，添加表头字段缓存功能
|
2023-03-16 16:19:23 +08:00 |
|
sy
|
dc2cb5f448
|
薪酬系统-薪资核算，薪资核算和薪资档案导出excel通用格式改造
|
2023-03-16 13:51:41 +08:00 |
|
Harryxzy
|
0130b83f00
|
Merge branch 'feature/加密方法&分页merge' into feature/V3-backItem-1215
# Conflicts:
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
|
2022-12-14 12:21:42 +08:00 |
|
Harryxzy
|
3ff3fd8e44
|
薪资回算-薪资核算部分（剩余核算归档）
|
2022-12-02 17:35:14 +08:00 |
|
钱涛
|
991338a10e
|
合计行异步处理
|
2022-12-02 16:58:19 +08:00 |
|
钱涛
|
271daf29be
|
批量锁定功能
|
2022-11-17 09:28:40 +08:00 |
|
Harryxzy
|
183e63140a
|
xzy-月度绩效环比增加人员导出功能
|
2022-09-20 16:18:43 +08:00 |
|
Harryxzy
|
44b3c76a8e
|
xzy-同比增加人员
|
2022-09-19 16:05:59 +08:00 |
|
钱涛
|
7d79dcdfc2
|
修复社保福利列表高级搜索
|
2022-08-11 10:27:15 +08:00 |
|
钱涛
|
e9c95918eb
|
1、核算表头带上公式
2、修复核算时取福利台账人员信息不准确
|
2022-08-02 14:58:18 +08:00 |
|
钱涛
|
c6ea4c5698
|
线下对比
|
2022-05-26 15:45:37 +08:00 |
|
钱涛
|
b0b18ecb5e
|
导出日志和申报表异常
|
2022-05-09 10:32:14 +08:00 |
|
钱涛
|
231961663f
|
核算结果导出
|
2022-05-05 14:10:19 +08:00 |
|
钱涛
|
8abfb7631e
|
fix线下对比404
|
2022-04-27 09:43:24 +08:00 |
|
钱涛
|
6a024cb35b
|
权限构造
|
2022-04-25 18:06:09 +08:00 |
|
钱涛
|
b1b086caf1
|
预览
|
2022-04-19 19:50:00 +08:00 |
|
钱涛
|
ccd4768a0e
|
线下对比导入
|
2022-04-19 19:34:57 +08:00 |
|
钱涛
|
dc008dad5c
|
核算导入
|
2022-04-19 19:32:09 +08:00 |
|
钱涛
|
91da4ab831
|
自定义按钮
|
2022-04-18 17:28:34 +08:00 |