 钱涛
|
46b3dde438
|
税后工资接口
|
2024-07-17 09:03:31 +08:00 |
|
钱涛
|
e45ee09c7e
|
Merge branch 'release/2.15.1.2407.01' into release/个税版本
|
2024-07-16 17:25:37 +08:00 |
|
钱涛
|
909152decc
|
报表导出改为从内存获取
|
2024-07-16 16:57:58 +08:00 |
Harryxzy
|
6f7ae2506d
|
阅后即焚oracle数据库修复
|
2024-07-16 14:56:11 +08:00 |
|
Harryxzy
|
78cdadbb99
|
工资单详情 - 显示列定制
|
2024-07-16 11:30:25 +08:00 |
|
钱涛
|
0fb8ed1792
|
修复个税映射
|
2024-07-15 16:59:10 +08:00 |
|
Harryxzy
|
95ba4aee36
|
Merge branch 'fix/240701_返聘action优化' into release/2.15.1.2407.01
|
2024-07-15 14:48:21 +08:00 |
|
Harryxzy
|
5331494ebc
|
Merge branch 'fix/240701_报表分页' into release/2.15.1.2407.01
|
2024-07-15 14:48:08 +08:00 |
|
Harryxzy
|
e579bbc4f2
|
人员维度分页
|
2024-07-15 11:20:24 +08:00 |
|
钱涛
|
a72c5e83e2
|
Merge branch 'release/2.15.1.2407.01' into release/个税版本
|
2024-07-15 10:25:50 +08:00 |
|
钱涛
|
b91818f2dc
|
版本
|
2024-07-15 09:36:40 +08:00 |
|
钱涛
|
50e3be607d
|
修复oracle bug
|
2024-07-11 16:30:00 +08:00 |
|
Harryxzy
|
a259a52044
|
人员维度分页
|
2024-07-11 11:28:54 +08:00 |
|
钱涛
|
7db62ab647
|
Merge branch 'release/2.14.5.2406.03' into release/个税版本
# Conflicts:
# src/com/engine/salary/entity/salaryacct/bo/CalculateFormulaVarBO.java
# src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
|
2024-07-10 17:05:06 +08:00 |
|
Harryxzy
|
a6f02082d8
|
fix社保福利台账非系统人员日志空指针
|
2024-07-10 15:01:49 +08:00 |
|
Harryxzy
|
84ce2821f6
|
1、定薪、返聘action优化
2、修复导出时excel中双击单元格变成黑色
|
2024-07-10 14:01:09 +08:00 |
|
钱涛
|
7ef229dfde
|
修复社保调差bug
|
2024-07-10 10:43:11 +08:00 |
|
Harryxzy
|
95b9f5452a
|
薪资档案导出fix多选义务人bug
|
2024-07-08 10:20:21 +08:00 |
|
钱涛
|
0c22a57f19
|
取消刷新缴款状态
取消线下缴款逻辑
|
2024-07-04 10:32:09 +08:00 |
|
Harryxzy
|
3a7c1c2d29
|
修复sql隐藏bug
|
2024-07-03 18:00:29 +08:00 |
|
钱涛
|
420d0a1fff
|
升级完税证明
|
2024-07-03 15:34:23 +08:00 |
|
钱涛
|
3f723d7750
|
记录日志
|
2024-07-02 19:13:14 +08:00 |
|
钱涛
|
39a2684196
|
升级缴款凭证作废接口
升级完税证明接口
|
2024-07-02 15:39:31 +08:00 |
|
钱涛
|
bdcdef34c2
|
非正常工资薪金的个税规则
|
2024-07-01 15:09:40 +08:00 |
|
Harryxzy
|
db93c2b8a8
|
修复报表分享记录分页总计数bug
|
2024-06-28 17:22:34 +08:00 |
|
钱涛
|
458f10d09b
|
优化考勤引用
|
2024-06-28 15:42:10 +08:00 |
|
钱涛
|
edddf5f557
|
处理8位小数问题
|
2024-06-28 14:42:23 +08:00 |
|
钱涛
|
77708b96ab
|
升级1
|
2024-06-28 14:02:05 +08:00 |
|
钱涛
|
9c7c6de614
|
核算信息快照
|
2024-06-27 16:10:30 +08:00 |
|
钱涛
|
d267810e5c
|
处理报表bug
|
2024-06-27 11:30:35 +08:00 |
|
钱涛
|
68467fbe46
|
升级作废申报
|
2024-06-27 11:19:34 +08:00 |
|
钱涛
|
ea07fe1a59
|
处理sqlserver 2100 个参数
|
2024-06-27 10:38:30 +08:00 |
|
钱涛
|
65fcfb8fac
|
更正申报
|
2024-06-27 09:30:25 +08:00 |
|
钱涛
|
de257568f1
|
轮询处理方式
记录接口日志
|
2024-06-26 14:56:43 +08:00 |
|
Harryxzy
|
b26663889d
|
Merge branch 'fix/240603_薪资明细导出排序' into release/2.14.5.2406.03
|
2024-06-26 11:33:32 +08:00 |
|
Harryxzy
|
933fc8ae65
|
报表分享支持次账号
|
2024-06-26 11:33:12 +08:00 |
|
Harryxzy
|
c1c8bae9da
|
Merge branch 'fix/240603_薪资明细导出排序' into release/2.14.5.2406.03
|
2024-06-26 10:37:51 +08:00 |
|
Harryxzy
|
63c7477966
|
1、薪资明细导出根据显示列定制导出
2、薪资档案 高级搜索支持个税扣缴义务人多选
|
2024-06-26 10:35:05 +08:00 |
|
钱涛
|
5cffdbc8e6
|
更正申报接口
|
2024-06-25 09:38:20 +08:00 |
|
钱涛
|
325e7609b7
|
1、欠费查询(下架)
2、获取欠费查询反馈(下架)
|
2024-06-24 17:07:36 +08:00 |
|
钱涛
|
610c824e69
|
局端申报状态查询(下架)
|
2024-06-24 17:05:41 +08:00 |
|
钱涛
|
d0da02119d
|
企业申报数据明细查询 (下架)
|
2024-06-24 17:02:53 +08:00 |
|
钱涛
|
bae85b761c
|
申报内置算税结果查询(下架)
|
2024-06-24 16:52:42 +08:00 |
|
钱涛
|
90a198bb54
|
1、作废人员信息（下架）
2、企业人员列表查询(下架)
3、关键信息变更(下架)
|
2024-06-24 16:32:15 +08:00 |
|
钱涛
|
fda10a06ae
|
1、企业登记及查询服务升级
2、申报密码校验服务升级
|
2024-06-24 16:23:32 +08:00 |
|
钱涛
|
993f21b448
|
Merge branch 'feature/人员信息快照' into release/2.14.5.2406.03
# Conflicts:
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
|
2024-06-21 14:17:36 +08:00 |
|
钱涛
|
6d3af9d4ed
|
wiki
|
2024-06-21 14:14:57 +08:00 |
|
钱涛
|
3a17e8c833
|
Merge branch 'release/个税版本' into feature/在线算税
|
2024-06-21 13:59:00 +08:00 |
|
钱涛
|
d5dd3093cb
|
处理冲突
|
2024-06-21 13:38:44 +08:00 |
|
钱涛
|
02be1b9da4
|
Merge branch 'release/2.14.4.2406.02' into release/个税版本
# Conflicts:
# src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml
# src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
# src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
# src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java
# src/com/engine/salary/util/excel/ExcelUtil.java
|
2024-06-21 10:53:59 +08:00 |