|
@@ -236,14 +236,8 @@ public class ReportUtils {
|
|
public List<ReportConfigGroup> getGroupList(List<Object> groupList, DateType dateType, Date startTime, Date endTime) throws Exception {
|
|
public List<ReportConfigGroup> getGroupList(List<Object> groupList, DateType dateType, Date startTime, Date endTime) throws Exception {
|
|
List<ReportConfigGroup> result = new ArrayList<>();
|
|
List<ReportConfigGroup> result = new ArrayList<>();
|
|
List<String> conlumnNameList = new ArrayList<>();
|
|
List<String> conlumnNameList = new ArrayList<>();
|
|
- for (Object obj : groupList) {
|
|
|
|
- List<String> group = (List<String>) obj;
|
|
|
|
- StringBuilder str = new StringBuilder();
|
|
|
|
- group.forEach(item -> {
|
|
|
|
- str.append(item).append(",");
|
|
|
|
- });
|
|
|
|
- String conlumnName = str.deleteCharAt(str.length() - 1).toString();
|
|
|
|
- conlumnNameList.add(conlumnName);
|
|
|
|
|
|
+ for (Object conlumnName : groupList) {
|
|
|
|
+ conlumnNameList.add((String) conlumnName);
|
|
}
|
|
}
|
|
QReportConfigGroup groupQt = QReportConfigGroup.reportConfigGroup;
|
|
QReportConfigGroup groupQt = QReportConfigGroup.reportConfigGroup;
|
|
Iterable<ReportConfigGroup> groupAll = reportConfigGroupRepository.findAll(groupQt.conlumnName.in(conlumnNameList));
|
|
Iterable<ReportConfigGroup> groupAll = reportConfigGroupRepository.findAll(groupQt.conlumnName.in(conlumnNameList));
|