Harryxzy
|
7330197d77
|
富士达历史数据调整
|
2025-08-29 10:38:30 +08:00 |
|
Harryxzy
|
2fa5dcc384
|
报表支持传账套id
|
2025-08-28 10:32:40 +08:00 |
|
Harryxzy
|
61cf337bde
|
薪资档案增加岗位，及报表接口调整
|
2025-08-22 17:14:26 +08:00 |
|
Harryxzy
|
c08478befb
|
富士达报表
|
2025-08-21 14:24:58 +08:00 |
|
Harryxzy
|
73c7ff48b3
|
富士达报表
|
2025-08-21 11:28:31 +08:00 |
 钱涛
|
d5c8bc7fb5
|
二开，引用功能
|
2025-05-15 09:57:05 +08:00 |
|
钱涛
|
5b4f11e9cf
|
二开，引用上月数据功能
|
2025-05-14 10:42:44 +08:00 |
|
钱涛
|
639330cf85
|
二开，引用上月数据功能
|
2025-05-14 10:26:50 +08:00 |
|
钱涛
|
5f97577b86
|
二开，引用上月数据功能
|
2025-05-14 09:34:46 +08:00 |
|
钱涛
|
44c96d36e3
|
Merge branch 'release/3.0.2.2504.01' into custom/中航富士达
# Conflicts:
# resource/WEB-INF/prop/hrmSalary.properties
|
2025-05-14 09:33:46 +08:00 |
|
Harryxzy
|
bb84021758
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-05-13 16:29:02 +08:00 |
|
Harryxzy
|
05e92add4a
|
修复明细导出
|
2025-05-13 16:07:46 +08:00 |
|
钱涛
|
214ac4c95a
|
二开，引用上月数据功能
|
2025-05-13 15:40:30 +08:00 |
|
钱涛
|
a0f85ea367
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-05-13 13:14:54 +08:00 |
|
钱涛
|
7de3dca2a3
|
撤回的工资单不允许查看
|
2025-05-13 13:14:30 +08:00 |
|
钱涛
|
ac1a767a29
|
版本
|
2025-05-09 10:19:58 +08:00 |
|
钱涛
|
98556e3a90
|
修改oracle去除;
|
2025-05-09 10:13:08 +08:00 |
|
钱涛
|
3ed13bd19c
|
Merge branch 'release/3.0.2.2504.01' into custom/中航富士达
# Conflicts:
# resource/WEB-INF/prop/hrmSalary.properties
|
2025-04-30 11:07:02 +08:00 |
|
钱涛
|
af89a43da7
|
修复业务线权限
|
2025-04-30 11:04:18 +08:00 |
|
钱涛
|
48632444fe
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-04-30 08:59:31 +08:00 |
|
钱涛
|
ca75a5f403
|
fix导出明细
|
2025-04-29 16:57:33 +08:00 |
|
钱涛
|
1a66a1f846
|
版本
|
2025-04-29 16:07:51 +08:00 |
|
Harryxzy
|
39cdde44f1
|
Merge branch 'release/3.0.2.2504.01' into custom/中航富士达
# Conflicts:
# resource/WEB-INF/prop/hrmSalary.properties
|
2025-04-28 18:18:10 +08:00 |
|
钱涛
|
23b1fae3a3
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-04-28 18:15:00 +08:00 |
|
钱涛
|
bc8e80b4e6
|
增加ＳＵＢＳＴＲ拦截处理
|
2025-04-28 18:14:17 +08:00 |
|
Harryxzy
|
344571997f
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-04-24 17:50:17 +08:00 |
|
Harryxzy
|
25c8479d53
|
修复社保福利台账线下对比和核算人数不匹配问题
|
2025-04-24 17:48:54 +08:00 |
|
钱涛
|
508012c82b
|
修复数据推送查询问题
|
2025-04-24 17:35:22 +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 |
|
钱涛
|
491a746c75
|
申报表税款所属期检索和申报
|
2025-04-23 17:45:14 +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 |
|
钱涛
|
64ad0a30d4
|
修复sql部署异常
|
2025-04-21 10:33:06 +08:00 |
|
钱涛
|
4d56cde7a9
|
版本
|
2025-04-17 15:34:29 +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 |
|
钱涛
|
6e366bed5a
|
fix账套列表检索问题
|
2025-04-17 14:20:14 +08:00 |
|
钱涛
|
d01c9bf06f
|
增加扣缴义务人搜索核算列表
|
2025-04-17 11:06:02 +08:00 |
|
钱涛
|
da6364a511
|
Merge remote-tracking branch 'origin/release/2.19.1.2501.01' into release/2.19.1.2501.01
|
2025-04-16 14:06:53 +08:00 |
|
钱涛
|
37445cdd58
|
fix部分发放
|
2025-04-16 14:06:46 +08:00 |
|
Harryxzy
|
99a0c3facc
|
2100bug修复
|
2025-04-16 13:26:36 +08:00 |
|
钱涛
|
b0fb2b3866
|
部分发放
|
2025-04-15 17:49:38 +08:00 |
|
钱涛
|
61beec603e
|
创建推送记录接口；
推送接口；
撤回接口；
|
2025-04-14 17:00:16 +08:00 |
|
Harryxzy
|
0bcafd3934
|
修复个税申报 不同税款所属期校验bug
|
2025-04-09 17:20:48 +08:00 |
|
钱涛
|
c04dad0c4d
|
修改字段名
|
2025-04-09 14:23:38 +08:00 |
|
钱涛
|
c32dab5562
|
数据撤回功能
|
2025-04-07 13:50:34 +08:00 |
|
钱涛
|
f4c025e078
|
数据推送
|
2025-04-07 09:19:47 +08:00 |