@@ -44,14 +44,16 @@
|
|||||||
'<%=localeMessage.getString("stdDefaultMan.columDesc")%>',
|
'<%=localeMessage.getString("stdDefaultMan.columDesc")%>',
|
||||||
'<%=localeMessage.getString("stdDefaultMan.columLen")%>',
|
'<%=localeMessage.getString("stdDefaultMan.columLen")%>',
|
||||||
'<%=localeMessage.getString("stdDefaultMan.keyOr")%>',
|
'<%=localeMessage.getString("stdDefaultMan.keyOr")%>',
|
||||||
'<%=localeMessage.getString("stdDefaultMan.ifOr")%>'
|
'<%=localeMessage.getString("stdDefaultMan.ifOr")%>',
|
||||||
|
'<%=localeMessage.getString("stdDefaultMan.orderSeq")%>'
|
||||||
],
|
],
|
||||||
colModel:[
|
colModel:[
|
||||||
{ name : 'COLUMNNAME' , align:'left' , sortable:false },
|
{ name : 'COLUMNNAME' , align:'left' , width: '200px', sortable:false },
|
||||||
{ name : 'COLUMNDESC' , align:'left' },
|
{ name : 'COLUMNDESC' , align:'left' , width: '200px' },
|
||||||
{ name : 'COLUMNLENGTH' , align:'right' },
|
{ name : 'COLUMNLENGTH' , align:'center' , width: '100px' },
|
||||||
{ name : 'ISKEY' , align:'center' },
|
{ name : 'ISKEY' , align:'center', width: '100px' },
|
||||||
{ name : 'ISINTERFACE' , align:'center' }
|
{ name : 'ISINTERFACE' , align:'center', width: '100px' },
|
||||||
|
{ name : 'ORDERSEQ' , align:'center', width: '100px' }
|
||||||
],
|
],
|
||||||
jsonReader: {
|
jsonReader: {
|
||||||
repeatitems:false
|
repeatitems:false
|
||||||
|
|||||||
+8
-1
@@ -5,7 +5,9 @@ import java.util.List;
|
|||||||
|
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.springframework.data.domain.Page;
|
import org.springframework.data.domain.Page;
|
||||||
|
import org.springframework.data.domain.PageRequest;
|
||||||
import org.springframework.data.domain.Pageable;
|
import org.springframework.data.domain.Pageable;
|
||||||
|
import org.springframework.data.domain.Sort;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
@@ -42,7 +44,12 @@ public class ExtendedColumnDefinitionService
|
|||||||
predicate = predicate.and(qExtendedColumnDefinition.columnDesc.containsIgnoreCase(searchColumnDesc));
|
predicate = predicate.and(qExtendedColumnDefinition.columnDesc.containsIgnoreCase(searchColumnDesc));
|
||||||
}
|
}
|
||||||
|
|
||||||
return repository.findAll(predicate, pageable);
|
Pageable orderedPageable = PageRequest.of(
|
||||||
|
pageable.getPageNumber(),
|
||||||
|
pageable.getPageSize(),
|
||||||
|
Sort.by(Sort.Order.asc("orderSeq"), Sort.Order.asc("columnName")));
|
||||||
|
|
||||||
|
return repository.findAll(predicate, orderedPageable);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user