Commit Graph

4165 Commits

Author SHA1 Message Date
钱涛 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
钱涛 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
钱涛 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
钱涛 dcd37b9ad3 钱智,版本 2025-11-21 14:04:44 +08:00
钱涛 d6e67b6e4a 钱智,搜索 2025-11-21 11:10:16 +08:00
钱涛 624a3f8c46 钱智,记录在线算税异常结果 2025-11-20 16:16:10 +08:00
钱涛 84e57edee1 常见sql 2025-11-18 17:52:26 +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
钱涛 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
钱涛 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
钱涛 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
钱涛 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
钱涛 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
钱涛 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
钱涛 0adfa422a4 版本 2025-10-13 13:47:55 +08:00
钱涛 f5f84a9ec3 Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01 2025-10-09 13:38:17 +08:00
钱涛 e3d6cbe5a1 批量锁定人员列 2025-09-30 16:40:20 +08:00
钱涛 0964dcd9ca 钱智未报送人员log 2025-09-25 11:15:35 +08:00
钱涛 33328ac7b9 Merge branch 'release/个税版本' into custom/钱智 2025-09-25 11:03:07 +08:00
钱涛 ae43dbbe04 人员报送批量处理 2025-09-25 11:02:46 +08:00
钱涛 38e1bd47c4 Merge branch 'release/个税版本' into custom/钱智
# Conflicts:
#	src/com/engine/salary/wrapper/TaxDeclareRecordWrapper.java
2025-09-24 17:00:56 +08:00
钱涛 d0e7f7ed8c 人员报送批量处理 2025-09-24 16:59:50 +08:00