 钱涛
|
d6e67b6e4a
|
钱智，搜索
|
2025-11-21 11:10:16 +08:00 |
|
钱涛
|
4c874c7569
|
Merge branch 'release/3.0.2.2504.01' into custom/钱智
|
2025-11-14 09:52:44 +08:00 |
|
钱涛
|
5c2c0f603f
|
Merge branch 'feature/批量操作' into custom/钱智
# Conflicts:
# src/com/engine/salary/entity/salaryacct/po/SalaryAcctRecordPO.java
# src/com/engine/salary/entity/taxdeclaration/param/TaxDeclarationBatParam.java
# src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.java
# src/com/engine/salary/service/SIAccountService.java
# src/com/engine/salary/service/SalaryAcctRecordService.java
# src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
# src/com/engine/salary/web/SalaryAcctController.java
# src/com/engine/salary/web/TaxDeclarationController.java
# src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
# src/com/engine/salary/wrapper/TaxDeclarationWrapper.java
|
2025-11-14 09:20:59 +08:00 |
|
钱涛
|
4b717e9b2c
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-11-13 11:38:08 +08:00 |
|
钱涛
|
6a061592e5
|
处理pg脚本
|
2025-11-13 11:37:46 +08:00 |
|
钱涛
|
613478b19c
|
钱智需求
|
2025-09-23 14:20:52 +08:00 |
|
钱涛
|
8f81b38d4d
|
Merge branch 'release/个税&业务线' into custom/钱智
|
2025-09-16 14:21:26 +08:00 |
|
钱涛
|
2bd092ae11
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2025-07-11 17:19:10 +08:00 |
|
钱涛
|
ed5f6da8a6
|
缴款需要按照分类分别缴纳
|
2025-07-11 17:18:15 +08:00 |
|
钱涛
|
4fd9883858
|
Merge branch 'release/个税&业务线' into custom/钱智
|
2025-07-03 09:09:35 +08:00 |
|
钱涛
|
2a883868ba
|
Merge branch 'release/个税版本' into release/个税&业务线
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
|
2025-07-02 20:08:08 +08:00 |
|
钱涛
|
cb02136ff6
|
免税收入
|
2025-07-01 18:37:50 +08:00 |
|
钱涛
|
490e6ab0fe
|
Merge branch 'release/个税&业务线' into custom/钱智
|
2025-06-19 11:05:53 +08:00 |
|
钱涛
|
0b566561a0
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2025-06-19 11:05:09 +08:00 |
|
钱涛
|
f5b1768438
|
利息股息红利所得sql
|
2025-06-19 10:49:29 +08:00 |
Harryxzy
|
5c2ede9736
|
sql
|
2025-06-10 10:52:24 +08:00 |
|
Harryxzy
|
773a128902
|
钱智 考勤引用二开
|
2025-05-23 14:05:11 +08:00 |
|
钱涛
|
603d31b095
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-05-09 16:28:56 +08:00 |
|
钱涛
|
98556e3a90
|
修改oracle去除;
|
2025-05-09 10:13:08 +08:00 |
|
钱涛
|
f638665b72
|
Merge branch 'release/个税&业务线' into custom/钱智
# Conflicts:
# src/com/engine/salary/service/impl/SIExportServiceImpl.java
|
2025-04-22 16:05:31 +08:00 |
|
钱涛
|
110cec1b33
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-04-21 14:27:00 +08:00 |
|
钱涛
|
64ad0a30d4
|
修复sql部署异常
|
2025-04-21 10:33:06 +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 |
|
钱涛
|
d4f45d5eb3
|
扩展排序字段
|
2025-04-03 10:49:10 +08:00 |
|
钱涛
|
0a78f17230
|
记录推送耗时
|
2025-04-02 17:05:04 +08:00 |
|
钱涛
|
8e3c4bfacc
|
数据推送配置sql
|
2025-04-01 16:43:02 +08:00 |
|
钱涛
|
10f1ec1629
|
确认名单sql
|
2025-03-19 16:03:12 +08:00 |
|
钱涛
|
f3577d3ddd
|
Merge branch 'feature/数据推送' into release/个税&业务线
# Conflicts:
# src/com/engine/salary/constant/SalaryDefaultTenantConstant.java
# src/com/engine/salary/entity/datacollection/po/OtherDeductionPO.java
# src/com/engine/salary/entity/salarysob/param/SalarySobListQueryParam.java
# src/com/engine/salary/mapper/datacollection/EmployMapper.java
# src/com/engine/salary/mapper/datacollection/EmployMapper.xml
# src/com/engine/salary/service/AddUpDeductionService.java
# src/com/engine/salary/service/OtherDeductionService.java
# src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
# src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
# src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobServiceImpl.java
# src/com/engine/salary/web/SalarySobController.java
# src/com/engine/salary/wrapper/SalarySobWrapper.java
|
2025-02-12 14:00:43 +08:00 |
|
钱涛
|
9adafca446
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/entity/taxdeclaration/param/TaxDeclarationSaveParam.java
# src/com/engine/salary/maintainer/datacollection/AddUpSituationManager.java
# src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
# src/com/engine/salary/wrapper/SalaryCommonWrapper.java
|
2025-02-08 15:50:39 +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 |
|
钱涛
|
0dd98cf616
|
薪资excel模板导出
|
2025-02-06 16:11:39 +08:00 |
|
Harryxzy
|
81e8b70746
|
Merge branch 'release/2.19.1.2501.01' into feature/数据推送
|
2025-02-06 14:22:06 +08:00 |
|
钱涛
|
b86854f368
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2025-01-23 16:49:17 +08:00 |
|
钱涛
|
0aabf7df6c
|
处理sql异常
|
2025-01-22 15:06:03 +08:00 |
|
钱涛
|
a5fdcc26e5
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
|
2025-01-22 11:48:31 +08:00 |
|
钱涛
|
50c3bbf41d
|
Merge branch 'release/2.19.1.2501.01' into feature/数据推送
# Conflicts:
# src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
|
2025-01-21 17:14:47 +08:00 |
|
Harryxzy
|
06dd1e51cf
|
钱智社保核算二开
|
2025-01-21 10:13:52 +08:00 |
|
钱涛
|
5e95742508
|
人事信息快照表
|
2025-01-15 16:39:50 +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 |
|
钱涛
|
412d3488d1
|
减免税额列表和保存接口
|
2024-12-24 10:54:57 +08:00 |
|
钱涛
|
cf253ecfb0
|
个人养老金附表
|
2024-12-23 16:41:42 +08:00 |
|
钱涛
|
8c83e8ed6c
|
新增免税收入、商业健康保险、税延养老保险、准予扣除的捐赠额、减免税额、其他附表
|
2024-12-16 17:48:03 +08:00 |
|
钱涛
|
f94ab9c3be
|
Merge branch 'release/2.17.1.2411.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/wrapper/SalaryCommonWrapper.java
|
2024-12-05 10:52:08 +08:00 |
|
钱涛
|
3d61bfa9a6
|
薪资报表明细显示定制列配置
|
2024-12-03 10:45:03 +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 |
|
钱涛
|
de5a00f588
|
修改默认列设置功能
|
2024-11-25 16:04:19 +08:00 |