|
@@ -87,7 +87,8 @@ public class TAlarmRecordController {
|
|
|
}
|
|
|
}
|
|
|
if(StringUtils.isNotEmpty(name)){
|
|
|
- LambdaQueryWrapper<TEquipment> query1 = Wrappers.lambdaQuery();
|
|
|
+ query.like(TAlarmRecord::getName,name);
|
|
|
+/* LambdaQueryWrapper<TEquipment> query1 = Wrappers.lambdaQuery();
|
|
|
query1.eq(TEquipment::getName,name);
|
|
|
List<TEquipment> list = tEquipmentService.list(query1);
|
|
|
TEquipment equipment = list.get(0);
|
|
@@ -99,7 +100,7 @@ public class TAlarmRecordController {
|
|
|
}
|
|
|
}else {
|
|
|
query.eq(TAlarmRecord::getName,name);
|
|
|
- }
|
|
|
+ }*/
|
|
|
}
|
|
|
if(startDate!=null){
|
|
|
query.gt(TAlarmRecord::getOccurrenceTime,startDate);
|
|
@@ -107,6 +108,7 @@ public class TAlarmRecordController {
|
|
|
if(endDate!=null){
|
|
|
query.lt(TAlarmRecord::getOccurrenceTime,endDate);
|
|
|
}
|
|
|
+ query.orderByDesc(TAlarmRecord::getOccurrenceTime);
|
|
|
Page<TAlarmRecord> page = new Page<>(current, size, true);
|
|
|
IPage<TAlarmRecord> iPage = tAlarmRecordService.page(page, query);
|
|
|
return R.ok(iPage);
|