|
@ -357,13 +357,13 @@ public class MedicinedeviceService extends BaseJpaService<Mediicinedevice, Medi
|
|
|
filter += " and t.temperature<="+temperatureEnd;
|
|
|
}
|
|
|
if(!StringUtils.isEmpty(temperatureStart)){
|
|
|
filter += " and t.temperature>="+temperatureStart;
|
|
|
filter += " and t.temperature<="+temperatureStart;
|
|
|
}
|
|
|
if(!StringUtils.isEmpty(humidityStart)){
|
|
|
filter += " and t.humidity>="+humidityStart;
|
|
|
}
|
|
|
if(!StringUtils.isEmpty(humidityEnd)){
|
|
|
filter += " and t.humidity>="+humidityEnd;
|
|
|
filter += " and t.humidity<="+humidityEnd;
|
|
|
}
|
|
|
|
|
|
String orderBy = " limit "+(page-1)*size+","+size;
|