|
@@ -28,7 +28,7 @@ public class ReportConfigService implements BaseService {
|
|
|
exps.addAll(CriteriaUtils.parse(qt.calculated, criteria.get("calculated")));
|
|
|
exps.addAll(CriteriaUtils.parse(qt.tableName, criteria.get("tableName")));
|
|
|
exps.addAll(CriteriaUtils.parse(qt.mappingName, criteria.get("mappingName")));
|
|
|
- exps.addAll(CriteriaUtils.parse(qt.group, criteria.get("group")));
|
|
|
+ exps.addAll(CriteriaUtils.parse(qt.groupColumn, criteria.get("group")));
|
|
|
return exps;
|
|
|
}
|
|
|
|
|
@@ -41,7 +41,7 @@ public class ReportConfigService implements BaseService {
|
|
|
entity.setCalculated(item.get(qt.calculated));
|
|
|
entity.setTableName(item.get(qt.tableName));
|
|
|
entity.setMappingName(item.get(qt.mappingName));
|
|
|
- entity.setGroup(item.get(qt.group));
|
|
|
+ entity.setGroupColumn(item.get(qt.groupColumn));
|
|
|
entity.setTableGroup(item.get(qt.tableGroup));
|
|
|
list.add(entity);
|
|
|
});
|