 钱涛
|
30027dca36
|
去除oracle sql异常符号
|
2024-08-23 10:22:34 +08:00 |
|
钱涛
|
1851457a6f
|
Merge branch 'release/2.15.1.2407.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/enums/SalaryOnOffEnum.java
# src/com/engine/salary/mapper/taxagent/TaxAgentMapper.java
# src/com/engine/salary/mapper/taxagent/TaxAgentMapper.xml
# src/com/engine/salary/service/SalarySobItemService.java
# src/com/engine/salary/service/TaxAgentService.java
# src/com/engine/salary/service/impl/SalaryItemServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobServiceImpl.java
# src/com/engine/salary/service/impl/TaxAgentServiceImpl.java
# src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
# src/com/engine/salary/wrapper/SalaryCommonWrapper.java
|
2024-08-23 10:08:08 +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 |
|
钱涛
|
5071c08d8c
|
Merge branch 'release/2.15.1.2407.01' into feature/导入工具
# Conflicts:
# src/com/engine/salary/service/impl/SalarySobServiceImpl.java
|
2024-08-15 13:41:52 +08:00 |
|
钱涛
|
f74ec99644
|
账套支持sql范围
|
2024-08-15 10:37:41 +08:00 |
|
钱涛
|
b83d45efa0
|
下载系统配置
|
2024-08-12 10:02:46 +08:00 |
|
钱涛
|
d86c77adb9
|
去除累计应扣缴税额
|
2024-07-23 14:57:35 +08:00 |
|
钱涛
|
d518b86c82
|
在线算税sql
|
2024-07-17 10:04:49 +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 |
|
钱涛
|
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 |
|
钱涛
|
65fcfb8fac
|
更正申报
|
2024-06-27 09:30:25 +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 |
|
钱涛
|
6d3af9d4ed
|
wiki
|
2024-06-21 14:14:57 +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 |
|
钱涛
|
28536476d3
|
版本
|
2024-06-21 09:16:44 +08:00 |
|
钱涛
|
8d65e5d501
|
版本记录
|
2024-06-20 14:48:35 +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 |
|
钱涛
|
7e988193c6
|
公式扩展获取月有多少天
|
2024-06-12 14:31:50 +08:00 |
|
钱涛
|
b7b1dc8aac
|
Merge branch 'release/2.14.3.2406.01' into release/个税版本2.14.3.2406.01
|
2024-06-06 15:54:07 +08:00 |
|
钱涛
|
7a67253407
|
版本
|
2024-06-06 15:35:12 +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 |
|
钱涛
|
c86b53fd27
|
Merge branch 'feature/锁定人员' into release/2.14.3.2406.01
|
2024-05-30 17:06:57 +08:00 |
|
钱涛
|
238438897b
|
处理工资单证件号码不显示
|
2024-05-29 14:04:16 +08:00 |
|
钱涛
|
1ca5b15a68
|
处理档案sql
|
2024-05-29 10:31:29 +08:00 |
|
钱涛
|
6bd0d1b8a8
|
锁定人员sql
|
2024-05-28 17:51:26 +08:00 |
|
钱涛
|
f298450e7c
|
根据身份证导入
|
2024-05-28 15:26:59 +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 |
|
钱涛
|
2cd255136d
|
版本
|
2024-05-23 16:13:47 +08:00 |
|
钱涛
|
43db025d98
|
Merge branch 'feature/账套副本' into release/2.14.2.2405.02
|
2024-05-23 11:36:38 +08:00 |
|
钱涛
|
79cfa0cbc0
|
删除往期累计多余项目
往期累计别名设置
|
2024-05-21 10:50:17 +08:00 |
|
钱涛
|
3dc8f6d57c
|
Merge branch 'release/2.14.1.2405.01' into release/个税版本
|
2024-05-20 09:56:12 +08:00 |
|
钱涛
|
4c3b34e376
|
sql
|
2024-05-17 15:41:15 +08:00 |
|
钱涛
|
6de3b1454d
|
获取档案信息sql
|
2024-05-16 14:06:38 +08:00 |
|
钱涛
|
af819896e4
|
版本
|
2024-05-14 13:45:03 +08:00 |
|
钱涛
|
04978dd8e6
|
Merge branch 'release/2.14.1.2405.01' into release/个税版本
|
2024-05-13 14:01:22 +08:00 |
|
钱涛
|
e7dee966d6
|
二开说明
|
2024-05-09 17:27:28 +08:00 |
|
钱涛
|
bcc1e35117
|
拦截核算记录样例
|
2024-05-08 17:28:43 +08:00 |
|
钱涛
|
ec27cf5a08
|
Merge branch 'release/2.13.1.2404.02' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/AddUpDeductionService.java
# src/com/engine/salary/wrapper/AddUpDeductionWrapper.java
|
2024-05-08 11:17:40 +08:00 |
|
钱涛
|
def5bae707
|
账套快照-隐藏字段脚本
|
2024-05-07 16:41:12 +08:00 |
|
钱涛
|
3428de9e33
|
账套快照
|
2024-05-06 16:03:29 +08:00 |
|
钱涛
|
4682866674
|
档案sql
|
2024-04-25 14:25:40 +08:00 |
|
钱涛
|
0661406c97
|
Merge branch 'release/2.13.1.2404.02' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
|
2024-04-25 11:47:47 +08:00 |
|
钱涛
|
d802d890d6
|
处理解密问题
|
2024-04-25 11:45:37 +08:00 |
|
钱涛
|
591555fa8a
|
更新sql
|
2024-04-23 17:47:02 +08:00 |
|
钱涛
|
1c2f0f516a
|
删除重复sql
|
2024-04-23 11:39:41 +08:00 |