Commit Graph

1724 Commits

Author SHA1 Message Date
钱涛 ecb0f6f7bc excel导入工具 2024-08-12 15:16:06 +08:00
钱涛 31cd3981e2 添加日志 2024-08-09 17:30:44 +08:00
钱涛 dd257ec53e xml文件 2024-08-09 09:22:27 +08:00
钱涛 6532225da3 迁移工具 2024-08-08 18:04:50 +08:00
钱涛 83a408afa2 迁移工具 2024-08-08 16:53:31 +08:00
钱涛 080a69c929 全量迁移 2024-08-08 09:50:04 +08:00
钱涛 484639a690 导入薪资项目、模板、预览 2024-08-07 14:40:08 +08:00
钱涛 d30380e2e7 导入薪资项目、模板、预览 2024-08-07 14:23:35 +08:00
钱涛 b8b9cbbe6c 导入薪资项目 2024-08-07 13:25:57 +08:00
钱涛 48120f8e24 导入薪资项目 2024-08-07 09:06:09 +08:00
钱涛 bd6e30b63b 导入薪资项目 2024-08-06 14:24:08 +08:00
钱涛 10d988084b 导入工具 2024-08-06 10:32:57 +08:00
Harryxzy bcf5fbdce7 Merge branch 'fix/240702-社保福利档案导入下载模板bug' into release/2.15.1.2407.01 2024-07-30 18:17:49 +08:00
Harryxzy 0c3610961f 修复社保福利档案 高级搜索后下载导入模板bug 2024-07-30 17:29:12 +08:00
Harryxzy 9819bb25e0 修复社保福利台账补差添加bug 2024-07-29 10:58:41 +08:00
Harryxzy bdd27bcfc6 核算时编辑人员组织信息 2024-07-25 14:04:14 +08:00
Harryxzy 6f7ae2506d 阅后即焚oracle数据库修复 2024-07-16 14:56:11 +08:00
Harryxzy 78cdadbb99 工资单详情 - 显示列定制 2024-07-16 11:30:25 +08:00
Harryxzy 95ba4aee36 Merge branch 'fix/240701_返聘action优化' into release/2.15.1.2407.01 2024-07-15 14:48:21 +08:00
Harryxzy a6f02082d8 fix社保福利台账非系统人员日志空指针 2024-07-10 15:01:49 +08:00
Harryxzy 84ce2821f6 1、定薪、返聘action优化
2、修复导出时excel中双击单元格变成黑色
2024-07-10 14:01:09 +08:00
钱涛 7ef229dfde 修复社保调差bug 2024-07-10 10:43:11 +08:00
钱涛 458f10d09b 优化考勤引用 2024-06-28 15:42:10 +08:00
钱涛 edddf5f557 处理8位小数问题 2024-06-28 14:42:23 +08:00
钱涛 9c7c6de614 核算信息快照 2024-06-27 16:10:30 +08:00
钱涛 ea07fe1a59 处理sqlserver 2100 个参数 2024-06-27 10:38:30 +08:00
Harryxzy b26663889d Merge branch 'fix/240603_薪资明细导出排序' into release/2.14.5.2406.03 2024-06-26 11:33:32 +08:00
Harryxzy 933fc8ae65 报表分享支持次账号 2024-06-26 11:33:12 +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
钱涛 2be7ec31de 修改工资单预览 2024-06-20 16:39:35 +08:00
Harryxzy 560fabe075 账套人员范围导入增加了一列,导致导入校验没通过 2024-06-20 16:28:48 +08:00
Harryxzy 3f9bb23e80 Merge branch 'feature/240502_薪资项目增加默认值设置' into release/2.14.4.2406.02 2024-06-20 11:44:15 +08:00
Harryxzy e13c2b0cd0 薪资项目同步默认值 2024-06-20 11:43:57 +08:00
Harryxzy 4fbd7d7418 Merge branch 'feature/240502_薪资项目增加默认值设置' into release/2.14.4.2406.02 2024-06-20 10:44:41 +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
钱涛 fe8dcd0ccd 核算默认值 2024-06-19 11:21:00 +08:00
钱涛 f0fce26e8a Merge branch 'release/2.14.4.2406.02' into feature/240502_薪资项目增加默认值设置
# Conflicts:
#	src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml
#	src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
2024-06-19 11:14:31 +08:00
钱涛 81c768b7b9 人员信息快照 2024-06-18 15:28:31 +08:00
钱涛 0c0c754a9d 人员信息快照 2024-06-18 11:01:58 +08:00
钱涛 5c13f80034 Merge remote-tracking branch 'origin/release/2.14.4.2406.02' into release/2.14.4.2406.02 2024-06-13 17:46:55 +08:00
钱涛 64e34d6d08 工资单预览 2024-06-13 17:46:37 +08:00
Harryxzy a27716ae72 Merge remote-tracking branch 'origin/release/2.14.4.2406.02' into release/2.14.4.2406.02 2024-06-13 14:14:38 +08:00
Harryxzy 6513c2b6e6 Merge branch 'fix/240601-补差导入模板bug' into release/2.14.4.2406.02 2024-06-13 14:14:21 +08:00
Harryxzy 1dd3439ce3 社保福利台账小数位优化 2024-06-13 13:59:43 +08:00
钱涛 4798f5d4a6 处理大数据内存溢出 2024-06-12 17:35:06 +08:00
钱涛 a1e7ec160c 处理复制异常 2024-06-11 10:10:45 +08:00
钱涛 789b77ba0b 档案导入模板注释 2024-06-06 14:54:58 +08:00
Harryxzy 16f5ffcf29 优化 - 社保福利台账小数位数 2024-06-05 15:30:57 +08:00
Harryxzy 91b8809c03 修复薪资核算搜索,合并计税bug 2024-06-05 13:43:49 +08:00
Harryxzy b6331b952c 修复
1、社保福利台账补差下载导入模板,显示的是补差数据;
2、报表分享不设置起始日期时oracle数据库兼容问题;
2024-06-05 11:02:59 +08:00