Commit Graph

163 Commits

Author SHA1 Message Date
钱涛 3d61bfa9a6 薪资报表明细显示定制列配置 2024-12-03 10:45:03 +08:00
钱涛 b652dbbc8b 处理报表空指针 2024-11-26 18:14:41 +08:00
钱涛 12df33960a 修改默认列设置功能 2024-11-25 18:05:18 +08:00
钱涛 de5a00f588 修改默认列设置功能 2024-11-25 16:04:19 +08:00
钱涛 e42e950905 fix薪资明细报表搜索 2024-11-12 15:34:51 +08:00
钱涛 553764da86 模板sql 2024-11-11 10:51:59 +08:00
Harryxzy ce80905ad0 薪资明细接口优化 2024-11-11 09:59:27 +08:00
钱涛 e537ffaa5a 薪资明细显示模板 2024-11-07 17:45:17 +08:00
钱涛 4cd0fbfe30 报表模板 2024-11-04 19:49:46 +08:00
钱涛 bfbd9e4b40 修复人员报表排序 2024-10-28 11:35:57 +08:00
钱涛 e3c6b08e6f 处理报表导出异常 2024-10-23 17:41:28 +08:00
钱涛 779d519a6f Merge branch 'release/2.15.2.2409.01' into feature/自定义列全局设置 2024-10-12 11:11:44 +08:00
钱涛 265ca2a54e 默认展示所有薪资明细列 2024-10-11 18:02:52 +08:00
钱涛 b6c7a7f2bd 自定义列全局设置 2024-10-11 17:04:13 +08:00
钱涛 64ac30c05f 自定义列全局设置 2024-10-11 15:34:17 +08:00
钱涛 2ba4bb72db 薪资明细增加入职日期 2024-10-09 18:10:38 +08:00
钱涛 3a128a4c5b 报表快照 2024-10-09 14:59:33 +08:00
钱涛 a40188659f 报表快照 2024-10-09 13:21:28 +08:00
钱涛 09ccda7883 Merge branch 'release/2.15.2.2409.01' into feature/快照条件搜索报表 2024-10-08 16:12:08 +08:00
钱涛 61dee5d3a1 薪资明细排序 2024-10-08 15:48:33 +08:00
钱涛 ff5419f2bb 薪资明细排序 2024-10-08 15:45:12 +08:00
钱涛 87f819f3e2 Merge branch 'release/2.15.2.2409.01' into feature/快照条件搜索报表 2024-10-08 14:25:26 +08:00
钱涛 ff44ddd8b1 员工明细排序 2024-10-08 14:19:02 +08:00
钱涛 8c0bad8023 报表快照 2024-09-30 10:37:27 +08:00
钱涛 13f0854208 报表缓存 2024-09-29 17:02:59 +08:00
钱涛 b4050e4ee8 报表快照搜索 2024-09-29 16:58:41 +08:00
钱涛 9f7fe00303 穿透显示快照组织信息 2024-09-25 13:38:45 +08:00
Harryxzy c4826515e1 Merge branch 'fix/240802-报表数据透视bug' into feature/240901-报表增加岗位筛选 2024-09-14 15:33:58 +08:00
Harryxzy eefd4d1795 报表增加岗位筛选 2024-09-14 15:33:31 +08:00
Harryxzy 9e5810f173 Merge branch 'feature/240801-浮动薪资' into release/2.15.2.2409.01 2024-09-13 11:11:24 +08:00
Harryxzy e3200f7932 fix报表数据透视 bug 2024-08-30 13:35:17 +08:00
Harryxzy be6e7bb787 工资明细导出excel单元格格式 2024-08-16 11:08:57 +08:00
Harryxzy a4d91c3c97 删除无用代码 2024-08-15 16:01:00 +08:00
Harryxzy 671350654a fix薪资明细报表显示列定制 2024-07-22 15:29:34 +08:00
Harryxzy 039c6fd568 薪资明细报表合计行过滤文本项 2024-07-22 10:27:46 +08:00
钱涛 909152decc 报表导出改为从内存获取 2024-07-16 16:57:58 +08:00
Harryxzy e579bbc4f2 人员维度分页 2024-07-15 11:20:24 +08:00
Harryxzy a259a52044 人员维度分页 2024-07-11 11:28:54 +08:00
Harryxzy db93c2b8a8 修复报表分享记录分页总计数bug 2024-06-28 17:22:34 +08:00
Harryxzy 933fc8ae65 报表分享支持次账号 2024-06-26 11:33:12 +08:00
Harryxzy 63c7477966 1、薪资明细导出根据显示列定制导出
2、薪资档案 高级搜索支持个税扣缴义务人多选
2024-06-26 10:35:05 +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
钱涛 db391f01c4 处理大数据内存溢出 2024-06-13 13:39:24 +08:00
Harryxzy e249de9a59 报表导出单元格格式 2024-06-12 16:01:09 +08:00
Harryxzy b6331b952c 修复
1、社保福利台账补差下载导入模板,显示的是补差数据;
2、报表分享不设置起始日期时oracle数据库兼容问题;
2024-06-05 11:02:59 +08:00
Harryxzy 51b4a3198c 修复报表数值项目出现文本值 2024-05-21 15:04:52 +08:00
Harryxzy ea968c316e 解决数据透视薪资项目排序问题 2024-04-25 14:04:13 +08:00
钱涛 a06a54f574 去除objectUtil 2024-04-01 20:25:23 +08:00
Harryxzy 5d2cc92bf8 Merge branch 'feature/240302-薪资明细表' into release/2.12.1.2403.02
# Conflicts:
#	src/com/engine/salary/mapper/datacollection/EmployMapper.java
#	src/com/engine/salary/mapper/datacollection/EmployMapper.xml
#	src/com/engine/salary/service/SalaryEmployeeService.java
#	src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
2024-03-29 10:49:39 +08:00
Harryxzy 3c8d1dc6ee 薪资明细表 2024-03-27 09:35:47 +08:00