midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-2789:csv export:query for detail tab is run same as number of record

This commit is contained in:
hieplq 2015-08-25 19:24:52 +08:00
parent 5e4575f822
commit 44a48fac03
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
org.adempiere.base/src/org/adempiere/impexp/GridTabCSVExporter.java
View File

@ -282,8 +282,16 @@ public class GridTabCSVExporter implements IGridTabExporter
} }
} }
while(true){
if(childs.size()>0){ if(childs.size()>0){
for (GridTab childTab:childs){
if (!childTab.isLoadComplete()){
childTab.initTab(false);
}
childTab.query(false, 0, 0);
}
while(true){
Map<String, Object> tmpRow = resolveMasterDetailRow(rowDetail,tabMapDetails,headArray,index); Map<String, Object> tmpRow = resolveMasterDetailRow(rowDetail,tabMapDetails,headArray,index);
if(tmpRow!= null){ if(tmpRow!= null){
for(Map.Entry<String, Object> details : tmpRow.entrySet()) { for(Map.Entry<String, Object> details : tmpRow.entrySet()) {
@ -296,8 +304,7 @@ public class GridTabCSVExporter implements IGridTabExporter
}else{ }else{
break; break;
} }
}else{
break;
} }
} }
@ -348,7 +355,6 @@ public class GridTabCSVExporter implements IGridTabExporter
GridTab childTab = childTabDetail.getKey(); GridTab childTab = childTabDetail.getKey();
//String whereCla = getWhereClause (childTab, parentGrid, currentParentIndex); //String whereCla = getWhereClause (childTab, parentGrid, currentParentIndex);
//childTab.getTableModel().dataRequery(whereCla, false, 0); //childTab.getTableModel().dataRequery(whereCla, false, 0);
childTab.query(false, 0, 0);
Map<String,Object> row = new HashMap<String,Object>(); Map<String,Object> row = new HashMap<String,Object>();
boolean isActiveRow = true; boolean isActiveRow = true;
if (childTab.getRowCount() > 0) { if (childTab.getRowCount() > 0) {