 钱涛
|
54f9c8f056
|
增加账套配置接口级锁
|
2024-09-11 16:15:02 +08:00 |
|
钱涛
|
3f9220e070
|
Merge branch 'release/2.15.2.2409.01' into release/个税版本
|
2024-09-11 16:14:35 +08:00 |
|
钱涛
|
7393d96259
|
增加账套配置接口级锁
|
2024-09-11 16:13:49 +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 |
|
钱涛
|
882716b10c
|
修复核算结果可能为空带来的影响
|
2024-09-05 14:13:43 +08:00 |
Harryxzy
|
0d5b1c37fd
|
Merge remote-tracking branch 'origin/release/2.15.1.2407.01' into release/2.15.1.2407.01
|
2024-09-03 09:24:22 +08:00 |
|
Harryxzy
|
44c11c7dcc
|
Merge branch 'feature/240801-社保方案上下限调整自动调整基数' into release/2.15.1.2407.01
|
2024-09-03 09:23:50 +08:00 |
|
钱涛
|
fa861c71dc
|
支持自定义单个线程处理人员数量
|
2024-09-02 18:11:00 +08:00 |
|
钱涛
|
ce1a82b6e7
|
Merge remote-tracking branch 'origin/release/2.15.1.2407.01' into release/2.15.1.2407.01
|
2024-09-02 18:10:39 +08:00 |
|
钱涛
|
b7f9a1653c
|
线程数量
|
2024-09-02 17:41:07 +08:00 |
|
Harryxzy
|
fedaf50187
|
返聘优化
|
2024-09-02 14:45:03 +08:00 |
|
钱涛
|
6319ff009b
|
Merge branch 'release/个税版本' into custom/艾志工业
|
2024-09-02 14:28:09 +08:00 |
|
钱涛
|
35e453b36e
|
Merge branch 'release/2.15.1.2407.01' into release/个税版本
|
2024-09-02 14:27:07 +08:00 |
|
钱涛
|
e44ba034f7
|
oracle缺失
|
2024-09-02 11:09:35 +08:00 |
|
钱涛
|
05a9b9e9b2
|
修改批量插入大小
|
2024-08-30 17:23:36 +08:00 |
|
Harryxzy
|
e3200f7932
|
fix报表数据透视 bug
|
2024-08-30 13:35:17 +08:00 |
|
Harryxzy
|
eb5cf04622
|
fix
|
2024-08-28 11:02:46 +08:00 |
|
钱涛
|
b56cc59cde
|
下载内置算税结果
|
2024-08-28 10:44:29 +08:00 |
|
钱涛
|
cfa5d2840c
|
在线对比回滚
|
2024-08-26 16:57:21 +08:00 |
|
钱涛
|
42e91e32da
|
改为通过快照信息搜索
|
2024-08-26 09:26:42 +08:00 |
|
钱涛
|
30027dca36
|
去除oracle sql异常符号
|
2024-08-23 10:22:34 +08:00 |
|
钱涛
|
ae72e8234a
|
fix冲突
|
2024-08-23 10:12:33 +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
|
59820f6aca
|
Merge branch 'fix/240801-核算导入支持vlookup' into release/2.15.1.2407.01
|
2024-08-20 14:03:58 +08:00 |
|
Harryxzy
|
2a58b4972b
|
薪资核算导入支持vlookup函数
|
2024-08-20 13:48:31 +08:00 |
|
钱涛
|
9fae93fcd7
|
Merge branch 'feature/导入工具' into release/2.15.1.2407.01
|
2024-08-20 11:40:33 +08:00 |
|
钱涛
|
9121268815
|
修复重新导入账套bug
|
2024-08-20 09:29:14 +08:00 |
|
Harryxzy
|
984e544503
|
社保方案上下限自动调整基数
|
2024-08-19 16:27:56 +08:00 |
|
Harryxzy
|
6dc9650305
|
Merge branch 'release/2.15.1.2407.01' into feature/240801-社保方案上下限调整自动调整基数
|
2024-08-19 16:01:06 +08:00 |
|
Harryxzy
|
26d300299b
|
社保方案上下限
|
2024-08-19 12:07:03 +08:00 |
|
钱涛
|
cd8d4601af
|
全量迁移配置
|
2024-08-19 09:49:49 +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 |
|
Harryxzy
|
8742ee7857
|
Merge branch 'fix/240801-工资明细导出excel单元格格式' into release/2.15.1.2407.01
|
2024-08-16 15:27:15 +08:00 |
|
钱涛
|
105129165d
|
Merge branch 'release/2.15.1.2407.01' into feature/240801-浮动薪资
|
2024-08-16 14:40:02 +08:00 |
|
钱涛
|
22c99e081d
|
支持Vlookup
|
2024-08-16 14:39:01 +08:00 |
|
钱涛
|
10b8be86d1
|
Merge branch 'release/2.15.1.2407.01' into feature/240801-浮动薪资
|
2024-08-16 14:14:30 +08:00 |
|
钱涛
|
4b9341cc98
|
支持Vlookup
|
2024-08-16 14:13:59 +08:00 |
|
钱涛
|
94d068356b
|
Merge branch 'release/2.15.1.2407.01' into feature/240801-浮动薪资
|
2024-08-16 14:07:56 +08:00 |
|
钱涛
|
4b30292c6c
|
支持Vlookup
|
2024-08-16 14:07:16 +08:00 |
|
钱涛
|
e2b2b9071f
|
Merge remote-tracking branch 'origin/feature/240801-浮动薪资' into feature/240801-浮动薪资
|
2024-08-16 14:04:31 +08:00 |
|
钱涛
|
1d388a1993
|
支持Vlookup
|
2024-08-16 14:04:20 +08:00 |
|
钱涛
|
659560550a
|
Merge branch 'release/2.15.1.2407.01' into feature/240801-浮动薪资
|
2024-08-16 13:18:08 +08:00 |
|
钱涛
|
d23baeb940
|
支持Vlookup
|
2024-08-16 12:19:18 +08:00 |
|
钱涛
|
673699dfb8
|
导入工具明细
|
2024-08-16 11:18:27 +08:00 |
|
Harryxzy
|
be6e7bb787
|
工资明细导出excel单元格格式
|
2024-08-16 11:08:57 +08:00 |
|
钱涛
|
7250ed3520
|
修复组织信息快照，主动添加或者sql添加人员丢失
|
2024-08-15 17:03:17 +08:00 |
|
钱涛
|
980dc2f532
|
导入工具
|
2024-08-15 16:25:31 +08:00 |
|
Harryxzy
|
a4d91c3c97
|
删除无用代码
|
2024-08-15 16:01:00 +08:00 |
|
Harryxzy
|
2ee605df44
|
浮动薪酬优化
|
2024-08-15 13:56:41 +08:00 |
|
钱涛
|
c079b1d2e6
|
Merge branch 'release/2.15.1.2407.01' into feature/导入工具
|
2024-08-15 13:48:14 +08:00 |