 钱涛
|
8c83e8ed6c
|
新增免税收入、商业健康保险、税延养老保险、准予扣除的捐赠额、减免税额、其他附表
|
2024-12-16 17:48:03 +08:00 |
|
钱涛
|
f94ab9c3be
|
Merge branch 'release/2.17.1.2411.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/wrapper/SalaryCommonWrapper.java
|
2024-12-05 10:52:08 +08:00 |
|
钱涛
|
3d61bfa9a6
|
薪资报表明细显示定制列配置
|
2024-12-03 10:45:03 +08:00 |
|
钱涛
|
de5a00f588
|
修改默认列设置功能
|
2024-11-25 16:04:19 +08:00 |
|
钱涛
|
ce098fcd89
|
Merge branch 'release/2.17.1.2411.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/SalarySobServiceImpl.java
# src/com/engine/salary/web/SalarySobController.java
# src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java
# src/com/engine/salary/wrapper/SalarySobItemWrapper.java
|
2024-11-19 13:29:22 +08:00 |
Harryxzy
|
8a06eaad93
|
Merge branch 'feature/工资单审批' into release/2.17.1.2411.01
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobServiceImpl.java
# src/com/engine/salary/sys/constant/SalarySysConstant.java
# src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
# src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java
|
2024-11-13 18:36:20 +08:00 |
|
钱涛
|
158e7dd20c
|
Merge branch 'feature/次账号' into release/2.17.1.2411.01
# Conflicts:
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
# src/com/engine/salary/sys/constant/SalarySysConstant.java
|
2024-11-12 18:05:42 +08:00 |
|
钱涛
|
af7d51ac79
|
Merge branch 'release/2.16.1.2410.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
# src/com/engine/salary/web/SalaryCommonController.java
# src/com/engine/salary/wrapper/SalaryCommonWrapper.java
|
2024-11-12 18:01:22 +08:00 |
|
钱涛
|
7aa3d12d4f
|
模板sql
|
2024-11-08 17:00:42 +08:00 |
|
Harryxzy
|
07c0492ec2
|
Merge branch 'release/2.16.1.2410.01' into feature/次账号
|
2024-11-04 17:29:32 +08:00 |
|
Harryxzy
|
989468cdc7
|
Merge branch 'feature/241001-社保台账人员信息快照' into release/2.16.1.2410.01
|
2024-11-01 14:33:14 +08:00 |
|
钱涛
|
4a7b218ee3
|
次账号sql
|
2024-10-25 15:19:16 +08:00 |
|
钱涛
|
517d1e8d0b
|
Merge branch 'release/2.16.1.2410.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
|
2024-10-18 11:08:18 +08:00 |
|
钱涛
|
641b085a28
|
单元格锁定sql
|
2024-10-17 18:53:37 +08:00 |
|
钱涛
|
06d6854ff3
|
Merge branch 'release/2.15.2.2409.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/constant/SalaryDefaultTenantConstant.java
# src/com/engine/salary/web/SalaryCommonController.java
# src/com/engine/salary/wrapper/SalaryCommonWrapper.java
|
2024-10-15 14:29:08 +08:00 |
|
钱涛
|
64ac30c05f
|
自定义列全局设置
|
2024-10-11 15:34:17 +08:00 |
|
钱涛
|
da4e908a7d
|
模板sql
|
2024-10-10 14:16:57 +08:00 |
|
Harryxzy
|
752de1fa8e
|
社保福利台账人员信息快照
|
2024-10-09 10:57:23 +08:00 |
|
钱涛
|
5d8cfbd169
|
Merge branch 'release/2.15.2.2409.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
|
2024-09-29 15:08:38 +08:00 |
|
钱涛
|
6f10ac4ab2
|
取消非系统人员菜单
|
2024-09-24 19:04:57 +08:00 |
|
钱涛
|
17ef5a3c2b
|
浮动数据菜单
|
2024-09-24 13:19:20 +08:00 |
|
Harryxzy
|
656236367a
|
Merge branch 'release/2.15.1.2407.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/util/excel/ExcelUtilPlus.java
|
2024-08-16 15:42:50 +08:00 |
|
钱涛
|
659560550a
|
Merge branch 'release/2.15.1.2407.01' into feature/240801-浮动薪资
|
2024-08-16 13:18:08 +08:00 |
|
钱涛
|
f74ec99644
|
账套支持sql范围
|
2024-08-15 10:37:41 +08:00 |
|
Harryxzy
|
1ebc56bb70
|
浮动薪酬增加义务人sql
|
2024-08-12 16:49:29 +08:00 |
|
Harryxzy
|
75fb15928a
|
浮动薪酬
|
2024-08-09 10:21:40 +08:00 |
|
钱涛
|
d86c77adb9
|
去除累计应扣缴税额
|
2024-07-23 14:57:35 +08:00 |
|
钱涛
|
d518b86c82
|
在线算税sql
|
2024-07-17 10:04:49 +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 |
|
钱涛
|
de257568f1
|
轮询处理方式
记录接口日志
|
2024-06-26 14:56:43 +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 |
|
钱涛
|
3a17e8c833
|
Merge branch 'release/个税版本' into feature/在线算税
|
2024-06-21 13:59:00 +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 |
|
钱涛
|
fa26d3041a
|
默认算税sql
|
2024-06-20 11:08:52 +08:00 |
|
钱涛
|
0c0c754a9d
|
人员信息快照
|
2024-06-18 11:01:58 +08:00 |
|
钱涛
|
6648e4140e
|
在线算税sql
|
2024-06-17 10:26:17 +08:00 |
|
钱涛
|
572b114f28
|
Merge branch 'release/2.14.3.2406.01' into release/个税版本2.14.3.2406.01
# Conflicts:
# src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml
# src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
|
2024-06-03 11:18:01 +08:00 |
|
钱涛
|
6bd0d1b8a8
|
锁定人员sql
|
2024-05-28 17:51:26 +08:00 |
|
钱涛
|
ec5463c050
|
Merge branch 'release/2.14.2.2405.02' into release/个税版本
# Conflicts:
# src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml
# src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
|
2024-05-27 10:37:39 +08:00 |
|
钱涛
|
79cfa0cbc0
|
删除往期累计多余项目
往期累计别名设置
|
2024-05-21 10:50:17 +08:00 |
|
钱涛
|
def5bae707
|
账套快照-隐藏字段脚本
|
2024-05-07 16:41:12 +08:00 |
|
钱涛
|
3428de9e33
|
账套快照
|
2024-05-06 16:03:29 +08:00 |
|
Harryxzy
|
8ff315b341
|
工资单审批sql
|
2024-04-25 17:24:47 +08:00 |
|
钱涛
|
1c2f0f516a
|
删除重复sql
|
2024-04-23 11:39:41 +08:00 |
|
钱涛
|
8f76daf0d1
|
Merge branch 'feature/外籍人员' into release/个税版本
|
2024-04-23 11:15:37 +08:00 |
|
钱涛
|
0e6449e1e2
|
外籍人员
|
2024-04-12 17:46:53 +08:00 |
|
Harryxzy
|
a9dd2c2cb3
|
Merge branch 'release/2.12.1.2403.02' into release/个税版本
|
2024-04-08 15:53:13 +08:00 |
|
Harryxzy
|
4ccfac80f5
|
sql
|
2024-04-01 16:33:13 +08:00 |
|
钱涛
|
2a692b13b4
|
外籍人员v1
|
2024-03-29 10:44:55 +08:00 |
|
钱涛
|
3a79ed9574
|
Merge branch 'release/2.11.2.2403.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
# src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java
# src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
|
2024-03-15 15:44:15 +08:00 |