 钱涛
|
c417b8da3e
|
处理社保补缴手动填写异常
|
2025-12-02 14:59:55 +08:00 |
|
钱涛
|
dbb571785c
|
处理冲突
|
2025-10-21 18:07:52 +08:00 |
|
钱涛
|
5439659ce3
|
Merge branch 'release/个税版本' into custom/昂立
# Conflicts:
# src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java
# src/com/engine/salary/entity/salaryacct/dto/SalaryAcctRecordListDTO.java
# src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java
# src/com/engine/salary/mapper/archive/SalaryArchiveItemMapper.java
# src/com/engine/salary/mapper/archive/SalaryArchiveItemMapper.xml
# src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.xml
# src/com/engine/salary/service/SalaryAcctEmployeeService.java
# src/com/engine/salary/service/SalaryAcctRecordService.java
# src/com/engine/salary/service/SalaryArchiveItemService.java
# src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
# src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobServiceImpl.java
# src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
# src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java
|
2025-10-21 17:38:58 +08:00 |
|
钱涛
|
074ea5cf7f
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2025-10-21 16:59:19 +08:00 |
|
钱涛
|
953a590cca
|
常用sql
|
2025-10-21 16:55:42 +08:00 |
|
钱涛
|
014cdd7618
|
增加有序map
|
2025-10-17 17:29:31 +08:00 |
|
钱涛
|
e3d6cbe5a1
|
批量锁定人员列
|
2025-09-30 16:40:20 +08:00 |
|
钱涛
|
ae43dbbe04
|
人员报送批量处理
|
2025-09-25 11:02:46 +08:00 |
|
钱涛
|
d0e7f7ed8c
|
人员报送批量处理
|
2025-09-24 16:59:50 +08:00 |
|
钱涛
|
fbce286c17
|
修复字段管理分权问题
|
2025-09-18 16:31:58 +08:00 |
|
钱涛
|
17247f111f
|
批量人员报送
|
2025-09-16 16:23:44 +08:00 |
|
钱涛
|
c4f860f742
|
1、批量申报
|
2025-09-16 11:42:20 +08:00 |
|
钱涛
|
07cdf2063a
|
1、批量申报
|
2025-09-16 11:41:33 +08:00 |
|
钱涛
|
943ce95ccc
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/SalaryAcctRecordService.java
# src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
# src/com/engine/salary/web/TaxDeclarationController.java
# src/com/engine/salary/wrapper/TaxDeclarationWrapper.java
|
2025-09-16 11:21:28 +08:00 |
|
钱涛
|
1ae436e91a
|
修复社保批量核算
|
2025-09-16 10:07:16 +08:00 |
|
钱涛
|
f224916aac
|
社保台账：
1、批量新建核算记录并核算。
2、批量归档
3、批量重新核算
薪资核算：
1、批量新建核算记录并核算。
2、批量归档
3、批量重新核算
工资单：
1、批量发放
2、批量撤回
申报表：
1、批量申报
|
2025-09-16 10:07:16 +08:00 |
|
钱涛
|
2767114bfb
|
社保台账：
1、批量新建核算记录并核算。
2、批量归档
3、批量重新核算
薪资核算：
1、批量新建核算记录并核算。
2、批量归档
3、批量重新核算
工资单：
1、批量发放
2、批量撤回
申报表：
1、批量申报
|
2025-09-16 10:07:15 +08:00 |
Harryxzy
|
0762fbee4d
|
社保StringUtils修改为lang3包中
|
2025-09-12 15:59:40 +08:00 |
|
Harryxzy
|
24676fe027
|
考勤引用多语言修复
|
2025-09-10 11:45:43 +08:00 |
|
钱涛
|
aa864cdd38
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2025-07-11 17:18:47 +08:00 |
|
钱涛
|
ed5f6da8a6
|
缴款需要按照分类分别缴纳
|
2025-07-11 17:18:15 +08:00 |
Harryxzy
|
fb239f34ed
|
修复薪资核算筛选为空时导出报错
|
2025-07-09 10:08:27 +08:00 |
|
钱涛
|
b82538fea9
|
申报免税收入
|
2025-07-08 18:28:00 +08:00 |
|
钱涛
|
d3e40d1b9e
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2025-07-07 10:21:36 +08:00 |
|
钱涛
|
8168a42b61
|
日志
|
2025-07-07 10:20:53 +08:00 |
|
Harryxzy
|
be3b4fc7e1
|
个税版本 个税申报bug修复
|
2025-07-04 15:13:28 +08:00 |
|
钱涛
|
fe7481d753
|
核算精准使用附表
|
2025-07-02 20:02:05 +08:00 |
|
钱涛
|
b2507306e5
|
附表导入导出功能
|
2025-07-02 15:46:32 +08:00 |
|
钱涛
|
cabaed627b
|
其他附加扣除增加申报类型
|
2025-07-02 13:42:41 +08:00 |
|
钱涛
|
de713c820d
|
附表填写
|
2025-07-02 11:37:16 +08:00 |
|
钱涛
|
cb02136ff6
|
免税收入
|
2025-07-01 18:37:50 +08:00 |
|
Harryxzy
|
bfd953d082
|
水印单独配置分部不显示
|
2025-06-19 17:28:09 +08:00 |
|
Harryxzy
|
e402029f6c
|
Merge remote-tracking branch 'origin/release/2.19.1.2501.01' into release/2.19.1.2501.01
|
2025-06-19 11:38:40 +08:00 |
|
Harryxzy
|
63c9558331
|
修复社保上下限校验 漏掉只开启了公司没开启个人的场景
|
2025-06-19 11:38:05 +08:00 |
|
钱涛
|
f5b1768438
|
利息股息红利所得sql
|
2025-06-19 10:49:29 +08:00 |
|
钱涛
|
c7e295e1d2
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2025-06-18 17:21:51 +08:00 |
|
钱涛
|
f7cba636b3
|
修复默认值保留位数
|
2025-06-18 17:21:22 +08:00 |
|
钱涛
|
c27105aa21
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2025-06-18 13:33:02 +08:00 |
|
钱涛
|
919ade5715
|
Merge remote-tracking branch 'origin/release/2.19.1.2501.01' into release/2.19.1.2501.01
|
2025-06-18 13:32:17 +08:00 |
|
钱涛
|
de5caded9e
|
修复工资单性别问题
|
2025-06-18 13:32:12 +08:00 |
|
钱涛
|
c3d6ac8b66
|
分类所得-上市公司股息红利所得(沪市、深市、创业板)
分类所得-其他利息股息红利所得
|
2025-06-17 17:25:27 +08:00 |
|
钱涛
|
d4ff9af8b7
|
分类所得-上市公司股息红利所得(沪市、深市、创业板)
分类所得-其他利息股息红利所得
|
2025-06-17 11:23:30 +08:00 |
|
Harryxzy
|
c2f2390013
|
修复薪资明细导出，合计行统计文本字段
|
2025-06-16 16:41:38 +08:00 |
|
Harryxzy
|
447d682b4e
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2025-06-13 09:32:11 +08:00 |
|
钱涛
|
adbdb64b4c
|
补偿金自动生成免税附表
|
2025-06-06 11:07:33 +08:00 |
|
钱涛
|
9af6178636
|
对“是否雇员”字段为“其他”时的场景做了调整。新增了一个字段 ”其他情况说明“
|
2025-06-06 10:27:16 +08:00 |
|
Harryxzy
|
aff5dbf185
|
Merge remote-tracking branch 'origin/release/2.19.1.2501.01' into release/2.19.1.2501.01
|
2025-05-29 10:39:32 +08:00 |
|
Harryxzy
|
578842aa39
|
修复数据穿透过滤条件
|
2025-05-29 10:39:06 +08:00 |
|
钱涛
|
1026ff1aae
|
fix邮件中数据为null
|
2025-05-27 15:56:33 +08:00 |
|
钱涛
|
d9982d2508
|
fix邮件中数据为null
|
2025-05-27 10:46:11 +08:00 |