by2025/SmartParks
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zcxlsm
2025-09-15 19:42:31 +08:00
parent b53f977e0b 8eb47ddb11
commit 345a0a6e84
2 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAlarmEventsBo.java
View File

@@ -126,4 +126,17 @@ public class SisAlarmEventsBo extends BaseEntity {
private Date finishTime;
private String description;
/**
* 0: 按id降序
* 1：按id升序
* 2：按创建时间降序
* 3：按创建时间升序
* 4：按指派时间降序
* 5 按指派时间升序
* 6 按完成时间升序
* 7 按完成时间升序
*/
private Integer orderBy = 0;
}

19
ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAlarmEventsServiceImpl.java
View File

@@ -99,6 +99,7 @@ public class SisAlarmEventsServiceImpl implements ISisAlarmEventsService {
@Override
public TableDataInfo<SisAlarmEventsVo> queryPageList(SisAlarmEventsBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<SisAlarmEvents> lqw = buildQueryWrapper(bo);
lqw.orderByDesc(SisAlarmEvents::getId);
Page<SisAlarmEventsVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
@@ -137,6 +138,24 @@ public class SisAlarmEventsServiceImpl implements ISisAlarmEventsService {
Date end = DateUtil.endOfDay(bo.getReportTime());
lqw.between(SisAlarmEvents::getReportTime, start, end);
}
if (bo.getOrderBy() == 0) {
lqw.orderByDesc(SisAlarmEvents::getId);
} else if (bo.getOrderBy() == 1) {
lqw.orderByAsc(SisAlarmEvents::getId);
} else if (bo.getOrderBy() == 2) {
lqw.orderByDesc(SisAlarmEvents::getCreateTime);
} else if (bo.getOrderBy() == 3) {
lqw.orderByAsc(SisAlarmEvents::getCreateTime);
} else if (bo.getOrderBy() == 4) {
lqw.orderByDesc(SisAlarmEvents::getSolveTime);
} else if (bo.getOrderBy() == 5) {
lqw.orderByAsc(SisAlarmEvents::getSolveTime);
} else if (bo.getOrderBy() == 6) {
lqw.orderByAsc(SisAlarmEvents::getFinishTime);
} else if (bo.getOrderBy() == 7) {
lqw.orderByAsc(SisAlarmEvents::getFinishTime);
}
return lqw;
}