 钱涛
|
a8dc1d4010
|
Merge branch 'feature/减免附表' into release/个税版本
|
2025-02-12 15:59:53 +08:00 |
|
钱涛
|
e398622191
|
处理冲突
|
2025-01-22 14:41:00 +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 |
|
钱涛
|
076e3029b1
|
获取已归档的正常工资薪金所得人员
|
2025-01-21 15:03:36 +08:00 |
|
钱涛
|
f2cbbbe18a
|
下载附表明细数据
|
2025-01-16 13:41:17 +08:00 |
|
钱涛
|
7a58e92fc7
|
同步主数据
|
2025-01-15 16:11:34 +08:00 |
|
钱涛
|
aea27897b7
|
同步主数据
|
2025-01-14 17:05:31 +08:00 |
|
钱涛
|
0bb2abc281
|
暂存
|
2025-01-14 14:56:36 +08:00 |
|
钱涛
|
d48f6131e0
|
暂存
|
2025-01-14 09:15:09 +08:00 |
|
钱涛
|
5ec4fc3516
|
申报表查看附表
|
2025-01-03 17:38:47 +08:00 |
|
钱涛
|
5946ea6985
|
修复其他免税编辑功能
|
2024-12-27 15:38:00 +08:00 |
|
钱涛
|
39c536c7b4
|
申报功能
|
2024-12-26 15:16:24 +08:00 |
|
钱涛
|
5b241cda49
|
导入功能
|
2024-12-25 16:42:27 +08:00 |
|
钱涛
|
18bd6509db
|
导入功能
|
2024-12-25 16:28:21 +08:00 |
|
钱涛
|
2e4c3ddaff
|
删除接口
|
2024-12-25 10:36:37 +08:00 |
|
钱涛
|
9c99e53288
|
列表和保存接口
|
2024-12-24 15:52:36 +08:00 |
|
钱涛
|
412d3488d1
|
减免税额列表和保存接口
|
2024-12-24 10:54:57 +08:00 |
|
钱涛
|
cf253ecfb0
|
个人养老金附表
|
2024-12-23 16:41:42 +08:00 |
|
钱涛
|
d1a4b83f33
|
健康保险附表
|
2024-12-19 11:23:59 +08:00 |
|
钱涛
|
e6f8b31f69
|
延税养老保险附表
|
2024-12-19 10:57:21 +08:00 |
|
钱涛
|
fe8910f2c5
|
减免税额附表
|
2024-12-19 10:46:04 +08:00 |
|
钱涛
|
4a9a001311
|
几个附表列表
|
2024-12-19 09:53:56 +08:00 |
|
钱涛
|
d14ac4bda3
|
免税收入附表
|
2024-12-17 14:05:05 +08:00 |
Harryxzy
|
5459729da2
|
Merge branch 'feature/240301-导出excel单元格格式' into release/2.14.4.2406.02
# Conflicts:
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
|
2024-06-20 10:44:12 +08:00 |
|
钱涛
|
1b3da7dfc0
|
身份证
|
2024-05-23 09:16:28 +08:00 |
|
Harryxzy
|
5d0b8e7759
|
导出excel单元格格式
|
2024-03-18 14:01:08 +08:00 |
|
钱涛
|
0a7334ddef
|
考勤导入，多语言
|
2024-03-14 18:16:20 +08:00 |
|
钱涛
|
417c9f703d
|
下载模板时带出数据
|
2024-03-14 15:28:14 +08:00 |
|
钱涛
|
836947725f
|
切换了elog位置
|
2024-03-12 14:34:44 +08:00 |
|
钱涛
|
f325674673
|
Merge branch 'release/2.11.1.2402.01' into feature/操作日志组件
|
2024-03-04 09:41:35 +08:00 |
|
钱涛
|
8ae06f27b8
|
fix导入性能，导入方法类型改完外层引用
|
2024-02-29 15:53:22 +08:00 |
|
Harryxzy
|
093cb34f77
|
操作日志fix some bugs
|
2024-02-23 15:11:56 +08:00 |
|
Harryxzy
|
dee20149bb
|
日志
|
2024-02-21 18:19:02 +08:00 |
sy
|
6efbd9deb0
|
薪酬系统，将部分新增代码中labelId入参统一置为0，方便后期多语言逻辑适配时定位
|
2024-02-04 15:10:35 +08:00 |
|
钱涛
|
a8bfe83030
|
操作日志
|
2024-01-30 09:58:13 +08:00 |
|
钱涛
|
aec6918c12
|
Merge branch 'release/2.9.1.2307.01' into feature/外部人员
# Conflicts:
# src/com/engine/salary/biz/EmployBiz.java
# src/com/engine/salary/biz/SIAccountBiz.java
# src/com/engine/salary/entity/salaryBill/dto/SalarySendDetailListDTO.java
# src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java
# src/com/engine/salary/mapper/archive/SalaryArchiveMapper.java
# src/com/engine/salary/service/SalaryEmployeeService.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/SIAccountServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
# src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
# src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
# src/com/engine/salary/service/impl/SalarySendRangeServiceImpl.java
# src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java
# src/com/engine/salary/web/SalarySobController.java
# src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
# src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
# src/com/engine/salary/wrapper/SalarySendWrapper.java
# src/com/engine/salary/wrapper/TaxAgentSubAdminWrapper.java
# src/com/engine/salary/wrapper/TaxDeclarationWrapper.java
|
2023-07-11 16:08:15 +08:00 |
|
钱涛
|
2d8b4b07d0
|
Merge branch 'release/2.7.4.2304.02' into feature/报表
# Conflicts:
# src/com/engine/salary/biz/SIArchivesBiz.java
|
2023-04-28 10:49:33 +08:00 |
|
钱涛
|
9549e75e00
|
Merge branch 'release/2.7.3.2304.01' into feature/外部人员
|
2023-04-13 14:48:43 +08:00 |
|
Harryxzy
|
82ee707f16
|
employebiz改成employeeservice
|
2023-04-12 15:27:35 +08:00 |
|
钱涛
|
bb76df3718
|
个人养老金
|
2023-04-04 17:29:56 +08:00 |
|
钱涛
|
44fe9203ab
|
个人养老金
|
2023-04-04 14:21:25 +08:00 |
|
钱涛
|
a423790a35
|
获取人员信息
|
2023-03-06 17:57:20 +08:00 |
fcli
|
dea2353ef2
|
Merge branch 'feature/变更分页' into feature/加密方法&分页merge
# Conflicts:
# src/com/engine/salary/biz/SIAccountBiz.java
# src/com/engine/salary/biz/SalaryArchiveItemBiz.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/SpecialAddDeductionServiceImpl.java
|
2022-12-14 10:57:41 +08:00 |
|
fcli
|
d3de862d11
|
feat: 加密统一,薪资项目&社保档案详情...
|
2022-12-13 17:14:27 +08:00 |
|
fcli
|
b58e71989d
|
feat: 统一修改到内存分页
|
2022-12-12 10:25:55 +08:00 |
|
fcli
|
e6eaf96bcd
|
feat: 沿用上月增加校验
|
2022-11-17 15:39:39 +08:00 |
|
fcli
|
b03e5efbcf
|
feat: 沿用上月增加校验
|
2022-11-17 15:13:59 +08:00 |
|
fcli
|
0aa59757c5
|
feat: 沿用上月增加校验
|
2022-11-17 15:13:55 +08:00 |
|
fcli
|
5743fa2162
|
feat: 其他附加扣除沿用上月功能完成
|
2022-11-17 14:28:10 +08:00 |
|
Harryxzy
|
e2e383bd79
|
数据采集-Fix数据采集Long类型判断
|
2022-11-09 15:36:07 +08:00 |