@ -40,14 +40,20 @@ public class ListDataOrmService extends ListDataService {
@@ -40,14 +40,20 @@ public class ListDataOrmService extends ListDataService {
protected Filter getFilter ( ) {
Filter f = super . getFilter ( ) ;
for ( OnlineFilterDto onlineFilterDto : filterDtoList ) {
Object columnValue = onlineFilterDto . getColumnValue ( ) ;
if ( columnValue instanceof JSONObject ) {
JSONObject jsonObject = ( JSONObject ) columnValue ;
columnValue = jsonObject . get ( "id" ) ;
}
if ( onlineFilterDto . getFilterType ( ) = = FieldFilterType . EQUAL_FILTER ) {
f . add ( new FilterItem ( onlineFilterDto . getColumnName ( ) , FilterItem . equals , onlineFilterDto . getColumnValue ( ) ) ) ;
f . add ( new FilterItem ( onlineFilterDto . getColumnName ( ) , FilterItem . equals , c olumnValue) ) ;
} else if ( onlineFilterDto . getFilterType ( ) = = FieldFilterType . EXSITS ) {
f . add ( new FilterItem ( null , FilterItem . EXISTS , onlineFilterDto . getColumnValue ( ) ) ) ;
f . add ( new FilterItem ( null , FilterItem . EXISTS , c olumnValue) ) ;
} else if ( onlineFilterDto . getFilterType ( ) = = FieldFilterType . IN_LIST_FILTER ) {
f . add ( new FilterItem ( onlineFilterDto . getColumnName ( ) , FilterItem . INNER , onlineFilterDto . getColumnValue ( ) ) ) ;
f . add ( new FilterItem ( onlineFilterDto . getColumnName ( ) , FilterItem . INNER , c olumnValue) ) ;
} else if ( onlineFilterDto . getFilterType ( ) = = FieldFilterType . LIKE_FILTER ) {
f . add ( new FilterItem ( onlineFilterDto . getColumnName ( ) , FilterItem . like , "%" + onlineFilterDto . getC olumnValue( ) + "%" ) ) ;
f . add ( new FilterItem ( onlineFilterDto . getColumnName ( ) , FilterItem . like , "%" + c olumnValue + "%" ) ) ;
} else if ( onlineFilterDto . getFilterType ( ) = = FieldFilterType . RANGE_FILTER ) {
if ( onlineFilterDto . getColumnValueStart ( ) ! = null ) {
f . add ( new FilterItem ( onlineFilterDto . getColumnName ( ) , FilterItem . large_equals , onlineFilterDto . getColumnValueStart ( ) ) ) ;