 钱涛
|
aebe8c59f8
|
Merge branch 'release/2.16.1.2410.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.java
# src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.xml
# src/com/engine/salary/service/SalaryAcctRecordService.java
# src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
|
2024-10-28 13:40:56 +08:00 |
|
钱涛
|
28fa294c6f
|
异步记录日志
|
2024-10-24 10:19:35 +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 |
|
钱涛
|
cede931b0d
|
版本
|
2024-10-17 14:21:46 +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 |
|
钱涛
|
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 |
|
钱涛
|
7d0ebd1cdc
|
精简版常用查询
|
2024-09-26 17:00:59 +08:00 |
|
钱涛
|
6f10ac4ab2
|
取消非系统人员菜单
|
2024-09-24 19:04:57 +08:00 |
|
钱涛
|
17ef5a3c2b
|
浮动数据菜单
|
2024-09-24 13:19:20 +08:00 |
|
钱涛
|
db064863b2
|
版本号
|
2024-09-19 14:19:26 +08:00 |
Harryxzy
|
9e5810f173
|
Merge branch 'feature/240801-浮动薪资' into release/2.15.2.2409.01
|
2024-09-13 11:11:24 +08:00 |
|
钱涛
|
8aa34b806c
|
日志权限
|
2024-09-12 14:50:10 +08:00 |
|
钱涛
|
39d31d8377
|
Merge branch 'release/2.15.1.2407.01' into release/个税版本
# Conflicts:
# resource/wiki/扩展功能/hrmSalaryCustom.properties
|
2024-09-05 15:17:21 +08:00 |
|
钱涛
|
b7f9a1653c
|
线程数量
|
2024-09-02 17:41:07 +08:00 |
|
钱涛
|
e44ba034f7
|
oracle缺失
|
2024-09-02 11:09:35 +08:00 |
|
钱涛
|
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 |
|
钱涛
|
659560550a
|
Merge branch 'release/2.15.1.2407.01' into feature/240801-浮动薪资
|
2024-08-16 13:18:08 +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 |
|
Harryxzy
|
1ebc56bb70
|
浮动薪酬增加义务人sql
|
2024-08-12 16:49:29 +08:00 |
|
钱涛
|
b83d45efa0
|
下载系统配置
|
2024-08-12 10:02:46 +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 |
|
钱涛
|
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 |