 钱涛
|
eb26e556a3
|
Merge branch 'release/个税&业务线' into custom/联特
# Conflicts:
# src/com/engine/salary/util/excel/ExcelUtilPlus.java
|
2025-06-10 10:55:00 +08:00 |
|
钱涛
|
d35b6df42b
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2025-06-10 10:54:19 +08:00 |
|
钱涛
|
2cc43b8983
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-06-10 10:54:11 +08:00 |
|
钱涛
|
a16a16d13a
|
Merge branch 'release/3.0.2.2504.01' into custom/联特
# Conflicts:
# src/com/engine/salary/util/excel/ExcelUtilPlus.java
|
2025-06-10 10:53:55 +08:00 |
|
钱涛
|
adbdb64b4c
|
补偿金自动生成免税附表
|
2025-06-06 11:07:33 +08:00 |
|
钱涛
|
9af6178636
|
对“是否雇员”字段为“其他”时的场景做了调整。新增了一个字段 ”其他情况说明“
|
2025-06-06 10:27:16 +08:00 |
Harryxzy
|
5aefe5272d
|
联特 流程获取数据接口
|
2025-06-05 10:48:28 +08:00 |
|
钱涛
|
61153309ca
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-05-27 15:57:28 +08:00 |
|
钱涛
|
1026ff1aae
|
fix邮件中数据为null
|
2025-05-27 15:56:33 +08:00 |
|
钱涛
|
5ebae4208a
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-05-27 10:54:54 +08:00 |
|
钱涛
|
d9982d2508
|
fix邮件中数据为null
|
2025-05-27 10:46:11 +08:00 |
|
钱涛
|
5435a5a736
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-05-26 10:37:47 +08:00 |
|
钱涛
|
93dc70de26
|
fix邮件中数据为null
|
2025-05-26 10:36:38 +08:00 |
|
Harryxzy
|
97e90e0a81
|
Merge remote-tracking branch 'origin/custom/联特' into custom/联特
|
2025-05-14 15:03:51 +08:00 |
|
钱涛
|
24c67ddaf3
|
二开，人员报送刷新不引用停薪人员
|
2025-05-14 11:30:49 +08:00 |
|
Harryxzy
|
e2839767fa
|
联特，cbs推送
|
2025-05-14 11:06:07 +08:00 |
|
Harryxzy
|
888472d5e0
|
联特cbs对接
|
2025-05-13 11:05:10 +08:00 |
|
Harryxzy
|
8e839b23ba
|
Merge remote-tracking branch 'origin/custom/联特' into custom/联特
|
2025-05-12 18:31:09 +08:00 |
|
Harryxzy
|
4c05906f03
|
联特cbs对接
|
2025-05-12 17:42:15 +08:00 |
|
钱涛
|
d296fba3e9
|
二开，人员报送，刷新不采集税期当月或者之后月份
|
2025-05-09 19:43:44 +08:00 |
|
钱涛
|
df093e606c
|
二开，自离账套不参与申报
|
2025-05-09 17:59:40 +08:00 |
|
钱涛
|
223049c9c5
|
Merge branch 'release/个税&业务线' into custom/联特
# Conflicts:
# src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationPO.java
|
2025-05-09 16:31:23 +08:00 |
|
钱涛
|
aa37e174e9
|
Merge branch 'release/个税版本' into custom/联特
# Conflicts:
# src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
|
2025-05-09 16:18:18 +08:00 |
|
Harryxzy
|
2bd545964a
|
联特 季度绩效分段计算
|
2025-04-28 10:14: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 |
|
钱涛
|
43d35cb81b
|
Merge branch 'release/个税版本' into release/个税&业务线
# Conflicts:
# src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationPO.java
# src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
# src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
|
2025-04-24 11:07:01 +08:00 |
|
钱涛
|
35f8368715
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
# Conflicts:
# src/com/engine/salary/entity/taxdeclaration/param/TaxDeclarationListQueryParam.java
# src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationPO.java
# src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationMapper.xml
# src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
# src/com/engine/salary/web/TaxDeclarationController.java
|
2025-04-24 09:15:35 +08:00 |
|
钱涛
|
ac2143080f
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/entity/taxdeclaration/param/TaxDeclarationListQueryParam.java
# src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationPO.java
# src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationMapper.xml
# src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
# src/com/engine/salary/web/TaxDeclarationController.java
|
2025-04-23 18:10:26 +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 |
|
钱涛
|
06ba416d37
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-04-21 15:50:17 +08:00 |
|
钱涛
|
6b90c8c45c
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2025-04-21 15:50:00 +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 |
|
钱涛
|
110cec1b33
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-04-21 14:27:00 +08:00 |
|
钱涛
|
0e93cbab04
|
t
|
2025-04-21 10:37:44 +08:00 |
|
钱涛
|
4e2ea2017b
|
Merge branch 'release/3.0.2.2504.01' into custom/联特
|
2025-04-17 17:11:03 +08:00 |
|
钱涛
|
0eafdbfa4c
|
Merge branch 'release/2.19.1.2501.01' into custom/联特
|
2025-04-17 17:10:51 +08:00 |
|
Harryxzy
|
2e9971c998
|
联特 税款所属期下下月
|
2025-04-17 15:48:09 +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 |
|
钱涛
|
709ec2f3ce
|
Merge branch 'release/个税&业务线' into custom/联特
# Conflicts:
# src/com/engine/salary/service/impl/PushServiceImpl.java
|
2025-04-14 15:50:15 +08:00 |
|
Harryxzy
|
f97c49facc
|
联特 bug修复
|
2025-04-14 15:37:46 +08:00 |
|
钱涛
|
be8ede54df
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-04-09 14:25:43 +08:00 |
|
钱涛
|
c04dad0c4d
|
修改字段名
|
2025-04-09 14:23:38 +08:00 |
|
钱涛
|
47ba860cc6
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-04-08 16:39:27 +08:00 |
|
钱涛
|
ed15911067
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2025-04-08 16:38:45 +08:00 |
|
钱涛
|
f4c025e078
|
数据推送
|
2025-04-07 09:19:47 +08:00 |