|
|
@@ -885,8 +885,9 @@ public class ReportTableTask {
|
|
|
&& rawData.getDataSourceId().equals(dataSourceId1)
|
|
|
&& rawData.getItemName().equals(itemReadName)) {
|
|
|
currentRawDataList.add(rawData);
|
|
|
- rawDataList.remove(i);
|
|
|
- i--;
|
|
|
+ //如果一个报表中配置了，相同的数据项，这里将数据移除，会导致后面确实数据
|
|
|
+// rawDataList.remove(i);
|
|
|
+// i--;
|
|
|
}
|
|
|
}
|
|
|
for (int i = 0; i < cursorRawDataList.size(); i++) {
|
|
|
@@ -896,8 +897,8 @@ public class ReportTableTask {
|
|
|
&& cursorRawData.getDataSourceId().equals(dataSourceId1)
|
|
|
&& cursorRawData.getItemName().equals(itemReadName)) {
|
|
|
currentCursorRawDataList.add(cursorRawData);
|
|
|
- cursorRawDataList.remove(i);
|
|
|
- i--;
|
|
|
+// cursorRawDataList.remove(i);
|
|
|
+// i--;
|
|
|
}
|
|
|
}
|
|
|
//将所有数据组合成一个List<CursorRawData>
|
|
|
@@ -1005,8 +1006,8 @@ public class ReportTableTask {
|
|
|
&& rawData.getDataSourceId().equals(dataSourceId1)
|
|
|
&& rawData.getItemName().equals(itemReadName)) {
|
|
|
currentRawDataList.add(rawData);
|
|
|
- rawDataList.remove(i);
|
|
|
- i--;
|
|
|
+// rawDataList.remove(i);
|
|
|
+// i--;
|
|
|
}
|
|
|
}
|
|
|
for (int i = 0; i < cursorRawDataList.size(); i++) {
|
|
|
@@ -1016,8 +1017,8 @@ public class ReportTableTask {
|
|
|
&& cursorRawData.getDataSourceId().equals(dataSourceId1)
|
|
|
&& cursorRawData.getItemName().equals(itemReadName)) {
|
|
|
currentCursorRawDataList.add(cursorRawData);
|
|
|
- cursorRawDataList.remove(i);
|
|
|
- i--;
|
|
|
+// cursorRawDataList.remove(i);
|
|
|
+// i--;
|
|
|
}
|
|
|
}
|
|
|
//将所有数据组合成一个List<CursorRawData>
|
|
|
@@ -1201,8 +1202,8 @@ public class ReportTableTask {
|
|
|
&& rawData.getDataSourceId().equals(dataSourceId1)
|
|
|
&& rawData.getItemName().equals(itemReadName)) {
|
|
|
currentRawDataList.add(rawData);
|
|
|
- rawDataList.remove(i);
|
|
|
- i--;
|
|
|
+// rawDataList.remove(i);
|
|
|
+// i--;
|
|
|
}
|
|
|
}
|
|
|
for (int i = 0; i < cursorRawDataList.size(); i++) {
|
|
|
@@ -1212,8 +1213,8 @@ public class ReportTableTask {
|
|
|
&& cursorRawData.getDataSourceId().equals(dataSourceId1)
|
|
|
&& cursorRawData.getItemName().equals(itemReadName)) {
|
|
|
currentCursorRawDataList.add(cursorRawData);
|
|
|
- cursorRawDataList.remove(i);
|
|
|
- i--;
|
|
|
+// cursorRawDataList.remove(i);
|
|
|
+// i--;
|
|
|
}
|
|
|
}
|
|
|
//将所有数据组合成一个List<CursorRawData>
|
|
|
@@ -1319,8 +1320,8 @@ public class ReportTableTask {
|
|
|
&& rawData.getDataSourceId().equals(dataSourceId1)
|
|
|
&& rawData.getItemName().equals(itemReadName)) {
|
|
|
currentRawDataList.add(rawData);
|
|
|
- rawDataList.remove(i);
|
|
|
- i--;
|
|
|
+// rawDataList.remove(i);
|
|
|
+// i--;
|
|
|
}
|
|
|
}
|
|
|
for (int i = 0; i < cursorRawDataList.size(); i++) {
|
|
|
@@ -1330,8 +1331,8 @@ public class ReportTableTask {
|
|
|
&& cursorRawData.getDataSourceId().equals(dataSourceId1)
|
|
|
&& cursorRawData.getItemName().equals(itemReadName)) {
|
|
|
currentCursorRawDataList.add(cursorRawData);
|
|
|
- cursorRawDataList.remove(i);
|
|
|
- i--;
|
|
|
+// cursorRawDataList.remove(i);
|
|
|
+// i--;
|
|
|
}
|
|
|
}
|
|
|
//将所有数据组合成一个List<CursorRawData>
|
zhoupeng