 dxfeng
|
6a8a2b73d4
|
Merge branch 'custom/钱智' of http://221.226.25.34:3003/qt/weaver-hrm-salary into custom/钱智
|
2025-12-18 09:40:49 +08:00 |
|
dxfeng
|
2ac44c61d7
|
钱智报表开发
|
2025-12-16 15:31:31 +08:00 |
|
dxfeng
|
c1492e748b
|
钱智报表开发
|
2025-12-12 15:42:10 +08:00 |
 钱涛
|
b46b270dd1
|
钱智，社保报表
|
2025-12-08 16:58:04 +08:00 |
|
钱涛
|
b48b235898
|
修复null
|
2025-12-05 14:20:23 +08:00 |
|
钱涛
|
687510cdf2
|
Merge branch 'release/3.0.2.2504.01' into custom/钱智
|
2025-12-05 14:19:18 +08:00 |
|
钱涛
|
7acdc94380
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-12-05 14:18:59 +08:00 |
|
钱涛
|
b83a916610
|
修复null
|
2025-12-05 14:18:39 +08:00 |
|
钱涛
|
e7923a2486
|
修复业务线查询
|
2025-12-03 17:34:05 +08:00 |
|
钱涛
|
eebfa5ec3f
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-12-02 14:56:21 +08:00 |
|
钱涛
|
10a11dcca4
|
处理社保补缴手动填写异常
|
2025-12-02 14:55:50 +08:00 |
|
钱涛
|
cf68e118fa
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-12-02 10:22:35 +08:00 |
|
钱涛
|
cb423962a2
|
报表穿透，按照薪资所属月排序
|
2025-12-02 10:22:14 +08:00 |
|
钱涛
|
5ba83586d6
|
钱智封存权限
|
2025-12-01 16:43:05 +08:00 |
|
钱涛
|
a92bc80b64
|
钱智封存权限
|
2025-12-01 16:34:02 +08:00 |
|
钱涛
|
d0d2d7b70d
|
钱智封存功能
|
2025-12-01 15:29:57 +08:00 |
|
钱涛
|
37e9e06c56
|
钱智封存功能
|
2025-12-01 15:07:00 +08:00 |
|
钱涛
|
c3b2dc2982
|
钱智社保报表
|
2025-12-01 11:35:41 +08:00 |
|
钱涛
|
d1abbad832
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-11-28 17:48:21 +08:00 |
|
钱涛
|
00fc87ffd8
|
修复生成年终奖申报表null
|
2025-11-28 15:41:42 +08:00 |
|
钱涛
|
55238f1dfe
|
钱智，需求
|
2025-11-28 13:27:32 +08:00 |
|
钱涛
|
044b02e002
|
社保报表
|
2025-11-27 16:08:08 +08:00 |
|
钱涛
|
bfa4057016
|
钱智，社保
|
2025-11-27 10:44:01 +08:00 |
|
钱涛
|
5377a472cc
|
社保方案更新日志
|
2025-11-26 17:20:17 +08:00 |
|
钱涛
|
a85e371791
|
钱智，社保报表
|
2025-11-26 16:45:01 +08:00 |
|
钱涛
|
fe02f57215
|
钱智，社保报表
|
2025-11-25 16:13:40 +08:00 |
|
钱涛
|
ceb542ce89
|
Merge branch 'release/3.0.2.2504.01' into custom/钱智
|
2025-11-24 17:21:10 +08:00 |
|
钱涛
|
9f0c00ef25
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-11-24 17:20:43 +08:00 |
|
钱涛
|
85e0b85871
|
批量操作
|
2025-11-24 17:20:11 +08:00 |
|
钱涛
|
9326c77f5d
|
钱智，版本
|
2025-11-24 17:17:08 +08:00 |
|
钱涛
|
d6e67b6e4a
|
钱智，搜索
|
2025-11-21 11:10:16 +08:00 |
|
钱涛
|
624a3f8c46
|
钱智，记录在线算税异常结果
|
2025-11-20 16:16:10 +08:00 |
|
钱涛
|
37ff12bf6a
|
报表
|
2025-11-18 09:34:24 +08:00 |
|
钱涛
|
6a01e1b0f6
|
钱智，批量在线算税
|
2025-11-17 15:02:11 +08:00 |
|
钱涛
|
83adc57dda
|
钱智，批量核算
|
2025-11-14 13:25:33 +08:00 |
|
钱涛
|
9f98572144
|
申报
|
2025-11-14 10:12:22 +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 |
|
钱涛
|
20bd294397
|
考勤引用数据范围100
|
2025-11-12 14:57:46 +08:00 |
|
钱涛
|
44b5113ae9
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-11-06 11:28:17 +08:00 |
|
钱涛
|
e6a474261c
|
补缴信息提示优化
|
2025-11-06 11:27:41 +08:00 |
|
钱涛
|
e537107538
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-11-03 13:36:55 +08:00 |
|
钱涛
|
3dd8db37dc
|
账套sql类型的人员范围接入状态
|
2025-11-03 13:35:06 +08:00 |
|
钱涛
|
49d6f2f13b
|
钱智-考勤引用根据扣缴义务人过滤条件
|
2025-10-29 14:02:28 +08:00 |
|
钱涛
|
e1106de20c
|
Merge branch 'release/3.0.2.2504.01' into custom/钱智
|
2025-10-29 09:43:24 +08:00 |
|
钱涛
|
310be11f43
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-10-27 11:23:09 +08:00 |
|
钱涛
|
f1bd47f8b7
|
修复核算多条件问题
|
2025-10-27 11:22:51 +08:00 |
|
钱涛
|
a74227f12a
|
action日志
|
2025-10-23 10:44:50 +08:00 |
|
钱涛
|
9205c736ba
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-10-17 17:29:50 +08:00 |
|
钱涛
|
014cdd7618
|
增加有序map
|
2025-10-17 17:29:31 +08:00 |