Commit Graph

224 Commits

Author SHA1 Message Date
钱涛 0dd98cf616 薪资excel模板导出 2025-02-06 16:11:39 +08:00
Harryxzy 7b82b570e4 获取token增加https配置 2024-12-19 16:59:38 +08:00
Harryxzy 9daa406d83 优化token接口,避免不配时报错 2024-11-28 13:33:03 +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
Harryxzy 5953c2b938 薪酬token加解密 2024-11-06 13:37:03 +08:00
Harryxzy dbb332e07f Merge branch 'release/2.16.1.2410.01' into fix/240901_token加解密 2024-11-06 10:05:53 +08:00
Harryxzy 310c77a270 excel设置列宽 超过255报错 2024-10-11 15:14:21 +08:00
Harryxzy 3420c36448 人员id加密 2024-09-18 18:10:30 +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
Harryxzy 8742ee7857 Merge branch 'fix/240801-工资明细导出excel单元格格式' into release/2.15.1.2407.01 2024-08-16 15:27:15 +08:00
钱涛 22c99e081d 支持Vlookup 2024-08-16 14:39:01 +08:00
钱涛 4b9341cc98 支持Vlookup 2024-08-16 14:13:59 +08:00
钱涛 4b30292c6c 支持Vlookup 2024-08-16 14:07:16 +08:00
钱涛 d23baeb940 支持Vlookup 2024-08-16 12:19:18 +08:00
Harryxzy be6e7bb787 工资明细导出excel单元格格式 2024-08-16 11:08:57 +08:00
钱涛 83a408afa2 迁移工具 2024-08-08 16:53:31 +08:00
钱涛 48120f8e24 导入薪资项目 2024-08-07 09:06:09 +08:00
Harryxzy 84ce2821f6 1、定薪、返聘action优化
2、修复导出时excel中双击单元格变成黑色
2024-07-10 14:01:09 +08:00
Harryxzy 5459729da2 Merge branch 'feature/240301-导出excel单元格格式' into release/2.14.4.2406.02
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
2024-06-20 10:44:12 +08:00
Harryxzy e249de9a59 报表导出单元格格式 2024-06-12 16:01:09 +08:00
钱涛 43db025d98 Merge branch 'feature/账套副本' into release/2.14.2.2405.02 2024-05-23 11:36:38 +08:00
钱涛 26d6efd827 pdf日志 2024-05-17 10:58:38 +08:00
钱涛 6b0606f5a4 自适应 2024-05-07 17:37:02 +08:00
钱涛 3428de9e33 账套快照 2024-05-06 16:03:29 +08:00
Harryxzy 4f391a2159 工资单审批 2024-04-26 11:24:47 +08:00
钱涛 23eba4950b 处理pdf生成 2024-04-11 15:23:23 +08:00
钱涛 6a05269b2d 处理LIKE函数 2024-04-10 14:20:30 +08:00
Harryxzy 5d0b8e7759 导出excel单元格格式 2024-03-18 14:01:08 +08:00
钱涛 836947725f 切换了elog位置 2024-03-12 14:34:44 +08:00
钱涛 4b823ccca7 国际化注解 2024-03-11 16:50:47 +08:00
钱涛 f325674673 Merge branch 'release/2.11.1.2402.01' into feature/操作日志组件 2024-03-04 09:41:35 +08:00
钱涛 9e8fbbef89 去除pagehelper jar包 2024-02-26 16:25:17 +08:00
钱涛 f11d6a035c 去除pagehelper jar包 2024-02-26 15:40:52 +08:00
Harryxzy dee20149bb 日志 2024-02-21 18:19:02 +08:00
sy f4ecb19ef2 Merge branch 'release/2.10.1.2401.01' into feature/操作日志组件 2024-02-01 10:21:47 +08:00
钱涛 e5a0a85179 增加调薪原因,晋升、降职、调岗 2024-01-30 11:18:54 +08:00
钱涛 a8bfe83030 操作日志 2024-01-30 09:58:13 +08:00
钱涛 d2216eee13 Merge branch 'release/2.10.1.2401.01' into feature/操作日志组件
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
2024-01-29 15:07:58 +08:00
钱涛 6fc8d8fdee 去除达梦驱动 2024-01-25 11:38:38 +08:00
钱涛 a5303b42a8 Merge branch 'release/2.10.1.2401.01' into feature/操作日志组件 2024-01-23 14:08:14 +08:00
钱涛 887ec2084a 导出excel工具类 2024-01-23 14:06:56 +08:00
钱涛 a3aa0f5ca1 自适应文字长度 2024-01-17 10:55:42 +08:00
Harryxzy 7945c84fbb 薪资项目宽度 2024-01-02 16:37:07 +08:00
钱涛 7e22711dcd 导入工具 2023-12-28 15:47:05 +08:00
钱涛 06fe3144ba 导入模板 2023-12-28 15:37:01 +08:00
钱涛 bd0edcf8e2 日志组件 2023-12-22 14:50:16 +08:00
钱涛 04e3225c98 自适应 2023-12-12 10:07:31 +08:00
钱涛 e495c1799f 自定义 2023-12-11 09:52:47 +08:00