 钱涛
|
911085477d
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-11-20 16:21:58 +08:00 |
|
钱涛
|
84e57edee1
|
常见sql
|
2025-11-18 17:52:26 +08:00 |
|
钱涛
|
9555de6acf
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-11-18 10:58:27 +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 |
|
钱涛
|
179711bc1a
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-11-06 13:42:29 +08:00 |
|
钱涛
|
0a1acc89d3
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-10-29 15:46:38 +08:00 |
|
钱涛
|
b4994dab3f
|
常用sql
|
2025-10-29 15:46:24 +08:00 |
|
钱涛
|
af7ba37b4b
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-10-23 18:32:41 +08:00 |
|
钱涛
|
25f0713bb3
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2025-10-23 18:32:33 +08:00 |
|
钱涛
|
074ea5cf7f
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2025-10-21 16:59:19 +08:00 |
|
钱涛
|
038fac392c
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-10-21 16:56:09 +08:00 |
|
钱涛
|
953a590cca
|
常用sql
|
2025-10-21 16:55:42 +08:00 |
|
钱涛
|
0adfa422a4
|
版本
|
2025-10-13 13:47:55 +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 |
|
钱涛
|
d3e40d1b9e
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2025-07-07 10:21:36 +08:00 |
|
钱涛
|
9830b156a5
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-07-07 10:21:09 +08:00 |
|
钱涛
|
8168a42b61
|
日志
|
2025-07-07 10:20:53 +08:00 |
|
钱涛
|
b55ea81e4e
|
日志
|
2025-07-07 10:20:24 +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 |
|
钱涛
|
53c8909de4
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-06-25 14:37:22 +08:00 |
|
钱涛
|
45acec8468
|
上线版本
|
2025-06-19 14:40:09 +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 |
|
钱涛
|
603d31b095
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-05-09 16:28:56 +08:00 |
|
钱涛
|
ac1a767a29
|
版本
|
2025-05-09 10:19:58 +08:00 |
|
钱涛
|
98556e3a90
|
修改oracle去除;
|
2025-05-09 10:13:08 +08:00 |
|
钱涛
|
1a66a1f846
|
版本
|
2025-04-29 16:07:51 +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 |
|
钱涛
|
4d56cde7a9
|
版本
|
2025-04-17 15:34:29 +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 |
|
钱涛
|
97546393a4
|
上线版本
|
2025-03-27 16:31:40 +08:00 |
|
钱涛
|
8a49a2ef1b
|
上线版本
|
2025-03-27 16:13:19 +08:00 |
|
钱涛
|
e25c1f59d2
|
人员报送，业务线功能
|
2025-03-27 09:51:44 +08:00 |
|
钱涛
|
b1c1587344
|
Merge branch 'release/3.0.1.2503.01' into release/个税&业务线
# Conflicts:
# src/com/engine/salary/service/SalaryAcctResultService.java
# src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
# src/com/engine/salary/wrapper/SalarySobWrapper.java
|
2025-03-26 15:48:02 +08:00 |
|
钱涛
|
93defb41cd
|
版本
|
2025-03-20 17:32:06 +08:00 |
|
钱涛
|
10f1ec1629
|
确认名单sql
|
2025-03-19 16:03:12 +08:00 |
|
钱涛
|
93b98ce583
|
版本
|
2025-02-20 10:54:52 +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 |