 钱涛
|
a78c45f8f9
|
Merge branch 'master' into feature/操作日志组件
# Conflicts:
# src/com/engine/salary/report/entity/po/SalaryStatisticsItemPO.java
|
2024-02-22 15:20:14 +08:00 |
Harryxzy
|
dee20149bb
|
日志
|
2024-02-21 18:19:02 +08:00 |
|
钱涛
|
336aaeabea
|
文本维度，无分组排序放到末尾
|
2024-01-30 15:45:48 +08:00 |
|
钱涛
|
60616e8462
|
Merge branch 'release/2.10.1.2401.01' into feature/报表维度
|
2024-01-30 11:39:44 +08:00 |
|
钱涛
|
6fc8d8fdee
|
去除达梦驱动
|
2024-01-25 11:38:38 +08:00 |
|
钱涛
|
5d3a371f56
|
报表支持文本
|
2024-01-22 11:45:40 +08:00 |
|
钱涛
|
d09034b17b
|
报表支持文本
|
2024-01-22 10:38:18 +08:00 |
|
钱涛
|
40013d698b
|
暂存
|
2024-01-18 15:12:00 +08:00 |
|
钱涛
|
e8223a832b
|
缓存识别条件
|
2023-12-16 12:40:33 +08:00 |
|
钱涛
|
bda3d7080b
|
缓存识别条件
|
2023-12-16 12:36:56 +08:00 |
|
钱涛
|
4f8606b00e
|
缓存识别条件
|
2023-12-16 12:35:24 +08:00 |
|
钱涛
|
96d37b1b68
|
修复申报表明细
|
2023-12-14 10:39:49 +08:00 |
|
Harryxzy
|
8138b5297f
|
薪酬报表添加文本统计项目时，字符去值规则没有保存进去
|
2023-12-08 11:41:13 +08:00 |
|
钱涛
|
3dc5cc3a44
|
修改报表bug
|
2023-11-10 14:22:58 +08:00 |
|
钱涛
|
0cfbe05c54
|
报表日期
|
2023-11-09 16:14:35 +08:00 |
|
钱涛
|
675e5d7972
|
扩展人员属性
|
2023-11-09 11:34:00 +08:00 |
|
钱涛
|
e677207eac
|
新增统计维度展示
|
2023-11-08 15:59:54 +08:00 |
|
钱涛
|
d2ac1aec23
|
修改维度展示
|
2023-11-08 09:38:24 +08:00 |
|
钱涛
|
fbd19ecf75
|
缓存
|
2023-11-07 19:11:16 +08:00 |
|
钱涛
|
bcee3c5e5a
|
人员属性扩展
|
2023-11-07 19:06:43 +08:00 |
|
钱涛
|
5f371a8e58
|
报表复制
|
2023-11-07 15:55:03 +08:00 |
|
钱涛
|
b30c9b1ca9
|
Merge branch 'feature/扩展人员维度属性' into feature/报表支持自定义维度
|
2023-11-07 14:45:27 +08:00 |
|
钱涛
|
36a77a8e0f
|
自定义报表维度
|
2023-11-06 18:46:49 +08:00 |
|
钱涛
|
43d627c23a
|
扩展维度属性
|
2023-11-06 11:32:25 +08:00 |
|
钱涛
|
74f7c71ffe
|
扩展维度属性
|
2023-11-06 11:19:00 +08:00 |
|
钱涛
|
83f38d1d74
|
显示字符统计规则
|
2023-11-02 14:43:15 +08:00 |
|
钱涛
|
22a946d9ad
|
报表支持文本
|
2023-11-01 16:09:19 +08:00 |
|
钱涛
|
7fa3c31aac
|
报表支持文本
|
2023-11-01 09:54:09 +08:00 |
|
钱涛
|
0c77031e46
|
报表功能暂存
|
2023-10-31 17:08:28 +08:00 |
|
钱涛
|
16f46ae2da
|
报表人员维度增加部门和工号
|
2023-10-25 14:33:19 +08:00 |
|
Harryxzy
|
7a57849a25
|
报表fixbug
|
2023-09-21 15:05:39 +08:00 |
|
Harryxzy
|
9e95e3402b
|
删除多余注释
|
2023-09-21 11:02:48 +08:00 |
|
Harryxzy
|
dfc8a1c578
|
报表共享
|
2023-09-21 09:38:38 +08:00 |
|
Harryxzy
|
74e4d39b83
|
报表fix
|
2023-09-20 15:02:44 +08:00 |
|
Harryxzy
|
0eafc0ce94
|
报表temp
|
2023-09-20 09:10:47 +08:00 |
|
Harryxzy
|
897a7731bf
|
报表fixbug
|
2023-09-19 13:59:08 +08:00 |
|
Harryxzy
|
5d4231c241
|
报表共享fix
|
2023-09-19 13:11:24 +08:00 |
|
Harryxzy
|
c95098a22b
|
报表共享fix
|
2023-09-18 19:14:06 +08:00 |
|
Harryxzy
|
5f1ef51892
|
报表共享temp
|
2023-09-18 18:20:53 +08:00 |
|
钱涛
|
89ecf0984d
|
fix外部人员
|
2023-07-12 09:45:00 +08:00 |
|
钱涛
|
89ae0dc786
|
报表缓存时参数变更问题
|
2023-06-27 16:18:42 +08:00 |
|
Harryxzy
|
6ae98ce50a
|
Merge branch 'fix/新建定量维度时数据透视没有值' into release/2.8.4.2306.02
|
2023-06-26 14:23:27 +08:00 |
|
Harryxzy
|
e7edb9040c
|
修复无分类
|
2023-06-20 17:27:18 +08:00 |
|
Harryxzy
|
d60d24ea2e
|
新建定量维度时数据透视没有值
|
2023-06-20 14:31:06 +08:00 |
|
钱涛
|
5e6a65e47e
|
获取报表缓存，暂存方法
|
2023-06-15 18:48:31 +08:00 |
|
钱涛
|
5926697c29
|
报表缓存
|
2023-06-15 17:34:52 +08:00 |
|
Harryxzy
|
e034954d79
|
Merge branch 'fix/statisticsEditDelete' into release/2.8.4.2306.02
|
2023-06-13 10:19:37 +08:00 |
|
Harryxzy
|
849ea1e2d0
|
Merge remote-tracking branch 'origin/release/2.8.3.2306.01' into release/2.8.3.2306.01
|
2023-06-09 09:49:22 +08:00 |
|
Harryxzy
|
e24579f363
|
Merge branch 'feature/statisticDataPerspective' into release/2.8.3.2306.01
|
2023-06-09 09:48:27 +08:00 |
|
钱涛
|
892f99052b
|
报表数据接口返回报表id
|
2023-06-09 09:46:03 +08:00 |