|
@@ -88,12 +88,15 @@ public class ReportService {
|
|
Map<String, Object> dataMap = JsonMapper.json2map(JsonMapper.toSimpleJson(datum));
|
|
Map<String, Object> dataMap = JsonMapper.json2map(JsonMapper.toSimpleJson(datum));
|
|
Map<String, Object> dataListMap = JsonMapper.json2map(JsonMapper.toSimpleJson(entity));
|
|
Map<String, Object> dataListMap = JsonMapper.json2map(JsonMapper.toSimpleJson(entity));
|
|
for (String groupbyColumn : groupbyColumns) {
|
|
for (String groupbyColumn : groupbyColumns) {
|
|
- if (null == dataMap.get(groupbyColumn) || !dataMap.get(groupbyColumn).equals(dataListMap.get(groupbyColumn))) {
|
|
|
|
|
|
+ if (null == dataMap.get(groupbyColumn)) {
|
|
|
|
+ if (null == dataListMap.get(groupbyColumn)) {
|
|
|
|
+ bool = true;
|
|
|
|
+ } else {
|
|
|
|
+ bool = false;
|
|
|
|
+ }
|
|
|
|
+ } else if (!dataMap.get(groupbyColumn).equals(dataListMap.get(groupbyColumn))) {
|
|
bool = false;
|
|
bool = false;
|
|
}
|
|
}
|
|
- if(null == dataMap.get(groupbyColumn) && null == dataListMap.get(groupbyColumn)){
|
|
|
|
- bool = true;
|
|
|
|
- }
|
|
|
|
}
|
|
}
|
|
if (bool) {
|
|
if (bool) {
|
|
entity.getCalculatedColumns().addAll(datum.getCalculatedColumns());
|
|
entity.getCalculatedColumns().addAll(datum.getCalculatedColumns());
|