Harryxzy
|
59da7230c8
|
Merge branch 'release/个税版本' into custom/艾志工业
|
2025-04-11 13:59:17 +08:00 |
 钱涛
|
47dbfeb8db
|
确认名单反馈
|
2025-03-19 15:26:06 +08:00 |
|
Harryxzy
|
f3f814a145
|
Merge branch 'release/个税版本' into custom/艾志工业
# Conflicts:
# src/com/engine/salary/biz/EmployBiz.java
# src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveExcelBO.java
# src/com/engine/salary/service/AddUpSituationService.java
# src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
# src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
# src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java
# src/com/engine/salary/web/AddUpSituationController.java
# src/com/engine/salary/wrapper/AddUpSituationWrapper.java
|
2024-08-08 17:50:16 +08:00 |
|
钱涛
|
549edeeecb
|
日志
|
2024-08-08 11:52:10 +08:00 |
|
钱涛
|
90a198bb54
|
1、作废人员信息（下架）
2、企业人员列表查询(下架)
3、关键信息变更(下架)
|
2024-06-24 16:32:15 +08:00 |
|
钱涛
|
3a17e8c833
|
Merge branch 'release/个税版本' into feature/在线算税
|
2024-06-21 13:59:00 +08:00 |
|
Harryxzy
|
7359904509
|
Merge branch 'release/个税版本' into custom/艾志工业
# Conflicts:
# src/com/engine/salary/service/impl/SISchemeServiceImpl.java
# src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
|
2024-06-14 10:53:13 +08:00 |
|
Harryxzy
|
f71b8bf7c9
|
艾志 - 人员信息报送刷新根据首次发薪日判断
|
2024-06-14 10:43:15 +08:00 |
|
钱涛
|
e94273468e
|
处理刷新非正常人员问题
|
2024-06-11 15:27:00 +08:00 |
|
钱涛
|
e1e00f4db0
|
在线算税v1
|
2024-06-06 13:51:33 +08:00 |
|
Harryxzy
|
69877f518f
|
艾志 个税申报管理员功能，且注释上一次所开发的分权功能（通过建模按照部门维度所设置的权限）
|
2024-05-29 18:56:19 +08:00 |
|
Harryxzy
|
399852fe8a
|
艾志 个税申报管理员功能，且注释上一次所开发的分权功能（通过建模按照部门维度所设置的权限）
|
2024-05-29 18:52:12 +08:00 |
|
钱涛
|
1120e840c7
|
Merge branch 'feature/外籍人员' into custom/艾志工业-外籍人员
|
2024-04-16 20:27:06 +08:00 |
|
钱涛
|
a27ad1f070
|
并档案接口
|
2024-04-16 20:26:56 +08:00 |
|
钱涛
|
9f903daf65
|
Merge branch 'feature/外籍人员' into custom/艾志工业-外籍人员
# Conflicts:
# src/com/engine/salary/service/EmployeeDeclareService.java
|
2024-04-16 20:13:30 +08:00 |
|
钱涛
|
1496745488
|
作废人员接口
|
2024-04-16 20:12:48 +08:00 |
|
钱涛
|
b8fb4457e6
|
Merge branch 'feature/外籍人员' into custom/艾志工业-0412
# Conflicts:
# src/com/engine/salary/service/impl/EmployeeDeclareServiceImpl.java
# src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java
|
2024-04-12 17:58:05 +08:00 |
|
钱涛
|
d1b6a78238
|
人员报送
|
2024-04-10 09:08:24 +08:00 |
|
Harryxzy
|
d57d5f7e13
|
薪资核算导出模板优化
|
2024-03-29 16:23:08 +08:00 |
|
钱涛
|
2a692b13b4
|
外籍人员v1
|
2024-03-29 10:44:55 +08:00 |
|
Harryxzy
|
3c624fe859
|
Merge branch 'release/个税版本' into custom/艾志工业
|
2024-03-12 18:58:57 +08:00 |
|
钱涛
|
1d8a1b91c0
|
解决冲突
|
2024-03-12 18:58:36 +08:00 |
|
Harryxzy
|
a85e646e9a
|
Merge branch 'release/个税版本' into custom/艾志工业-个税申报-0308bak
|
2024-03-08 15:11:25 +08:00 |
|
钱涛
|
ddc9188cd9
|
只获取正常且报送成功的
|
2024-03-08 15:09:42 +08:00 |
|
钱涛
|
9415dd8e71
|
可删除报送成功人员
|
2024-03-08 11:34:50 +08:00 |
|
Harryxzy
|
73df953ae5
|
Merge branch 'release/个税版本' into custom/艾志工业-个税申报-0308bak
|
2024-03-08 11:14:31 +08:00 |
|
Harryxzy
|
6aef2856e8
|
个税日志
|
2024-03-08 11:14:00 +08:00 |
|
Harryxzy
|
878735cbc8
|
Merge branch 'release/个税版本' into custom/艾志工业-个税申报-0308bak
# Conflicts:
# src/com/engine/salary/entity/datacollection/AddUpSituation.java
# src/com/engine/salary/entity/employeedeclare/bo/EmployeeDeclareRefresh.java
# src/com/engine/salary/service/SIArchivesService.java
# src/com/engine/salary/service/impl/SIArchivesServiceImpl.java
# src/com/engine/salary/service/impl/SISchemeServiceImpl.java
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
# src/com/engine/salary/wrapper/SalaryFormulaWrapper.java
|
2024-03-08 09:59:40 +08:00 |
|
Harryxzy
|
d890ab5a84
|
Merge remote-tracking branch 'origin/release/个税版本' into release/个税版本
|
2024-03-08 09:26:57 +08:00 |
|
钱涛
|
8516a23bba
|
修改人员报送刷新逻辑
刷新人员会集成上月所有人员
|
2024-03-07 21:12:09 +08:00 |
|
Harryxzy
|
381c705cf8
|
人员信息报送、个税申报表日志
|
2024-03-07 09:29:59 +08:00 |
|
Harryxzy
|
bec6443dcf
|
Merge branch 'release/个税版本' into custom/艾志工业-个税申报
# Conflicts:
# src/com/engine/salary/biz/SIArchivesBiz.java
# src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationPO.java
# src/com/engine/salary/service/impl/SIAccountServiceImpl.java
# src/com/engine/salary/service/impl/SIArchivesServiceImpl.java
# src/com/engine/salary/service/impl/SIImportServiceImpl.java
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
# src/com/engine/salary/web/SIArchivesController.java
|
2024-02-22 14:57:39 +08:00 |
|
钱涛
|
079b7de258
|
合并240101
|
2024-02-21 15:35:08 +08:00 |
|
Harryxzy
|
58f9ba9d5b
|
艾志
|
2024-01-10 10:56:11 +08:00 |
|
Harryxzy
|
85e84ad1b3
|
Merge branch 'release/个税版本' into custom/艾志工业-个税申报
|
2024-01-02 09:42:18 +08:00 |
|
Harryxzy
|
dc3533d753
|
人员信息报送导入分页
|
2024-01-02 09:41:30 +08:00 |
|
钱涛
|
4e46d632e4
|
Merge branch 'feature/艾志-正常申报补足年终奖人员' into custom/艾志工业-个税申报
|
2023-12-28 21:00:15 +08:00 |
|
Harryxzy
|
2797745448
|
人员信息报送-导入
|
2023-12-26 17:45:06 +08:00 |
|
钱涛
|
9a5a0f4c00
|
Merge branch 'release/个税版本' into custom/艾志工业-个税申报
|
2023-12-18 15:25:05 +08:00 |
|
钱涛
|
a5ffe12509
|
身份证最后一位x转大写
|
2023-12-13 19:34:10 +08:00 |
|
钱涛
|
6cabf58c2e
|
Merge branch 'release/个税版本' into custom/艾志工业-个税申报
# Conflicts:
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
|
2023-12-07 15:56:01 +08:00 |
|
钱涛
|
009a3e3c74
|
人员报送导出
修复清除离职日期bug
|
2023-12-06 16:37:42 +08:00 |
|
钱涛
|
54d8f3ef39
|
修复人员信息无法置空问题
|
2023-12-05 17:17:11 +08:00 |
|
钱涛
|
1a061aa346
|
同步所有人员报送发薪日期为入职日期
|
2023-12-05 17:08:35 +08:00 |
|
钱涛
|
e055e34ca3
|
身份证
|
2023-10-24 18:54:22 +08:00 |
|
钱涛
|
4644f34bbb
|
人员和在线申报流量使用
|
2023-08-28 16:48:52 +08:00 |
|
钱涛
|
9e416123dd
|
账套薪资项目添加code
|
2023-08-23 16:49:45 +08:00 |
|
钱涛
|
bb2d2d64e6
|
在线申报接口
|
2023-08-21 19:35:14 +08:00 |
|
钱涛
|
2f59f8283a
|
人员报送接口
|
2023-08-20 14:03:43 +08:00 |
|
钱涛
|
d88c43c3c6
|
人员报送接口
|
2023-08-18 09:27:16 +08:00 |