diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/paginacion/PagedListWrapper.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/paginacion/PagedListWrapper.java index 92fb3f9af..3e782c781 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/paginacion/PagedListWrapper.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/paginacion/PagedListWrapper.java @@ -179,21 +179,25 @@ public class PagedListWrapper implements Serializable { final Comparator cmpr = lh.getSortDescending(); if (cmpr instanceof FieldComparator) { String orderBy = ((FieldComparator) cmpr).getOrderBy(); - orderBy = StringUtils.substringBefore(orderBy, "DESC").trim(); + String[] multipleOrderBy = getMultipleOrderBy(orderBy, "DESC"); // update SearchObject with orderBy getSearchObject().clearSorts(); - getSearchObject().addSort(orderBy, true); + for(String ob : multipleOrderBy){ + getSearchObject().addSort(ob,true); + } } } else if ("descending".equals(sortDirection) || "natural".equals(sortDirection) || Strings.isBlank(sortDirection)) { final Comparator cmpr = lh.getSortAscending(); if (cmpr instanceof FieldComparator) { String orderBy = ((FieldComparator) cmpr).getOrderBy(); - orderBy = StringUtils.substringBefore(orderBy, "ASC").trim(); + String[] multipleOrderBy = getMultipleOrderBy(orderBy, "ASC"); // update SearchObject with orderBy getSearchObject().clearSorts(); - getSearchObject().addSort(orderBy, false); + for(String ob : multipleOrderBy){ + getSearchObject().addSort(ob,false); + } } } @@ -209,7 +213,16 @@ public class PagedListWrapper implements Serializable { } } } - + + private String[] getMultipleOrderBy(String orderBy, String ascDesc){ + if(orderBy.contains(",")){ + return orderBy.replace(ascDesc, "").replace(" ", "").split(","); + }else{ + return new String[]{StringUtils.substringBefore(orderBy, ascDesc).trim()}; + } + } + + public PagedListService getPagedListService() { return pagedListService; } diff --git a/web/gui/impressaofiscal/busquedaTotnaofiscalEmpresa.zul b/web/gui/impressaofiscal/busquedaTotnaofiscalEmpresa.zul index f9dbea844..72cdf9d11 100644 --- a/web/gui/impressaofiscal/busquedaTotnaofiscalEmpresa.zul +++ b/web/gui/impressaofiscal/busquedaTotnaofiscalEmpresa.zul @@ -52,16 +52,16 @@ label="${c:l('lb.id')}" sort="auto(fiscaltotnaofiscalId)"/> + label="${c:l('busquedaTotnaofiscalEmpresaController.empresa.label')}" sort="auto(empresa.nombempresa,fiscaltotnaofiscalId)"/> + + + label="${c:l('busquedaTotnaofiscalEmpresaController.descricao.label')}" sort="auto(descricao,fiscaltotnaofiscalId)"/> - - + label="${c:l('busquedaTotnaofiscalEmpresaController.tipoeventoextra.label')}" sort="auto(tipoeventoextra.descTipoEvento,fiscaltotnaofiscalId)"/>