diff --git a/src/main/java/com/gxwebsoft/app/service/impl/AppTicketServiceImpl.java b/src/main/java/com/gxwebsoft/app/service/impl/AppTicketServiceImpl.java index 0e0e913..2df1d82 100644 --- a/src/main/java/com/gxwebsoft/app/service/impl/AppTicketServiceImpl.java +++ b/src/main/java/com/gxwebsoft/app/service/impl/AppTicketServiceImpl.java @@ -81,7 +81,8 @@ public class AppTicketServiceImpl extends ServiceImpl q.like(AppTicket::getTitle, param.getKeywords()) .or().like(AppTicket::getTicketNo, param.getKeywords())) - .orderByDesc(AppTicket::getCreateTime); + // 状态优先级:pending > assigned > processing > resolved > closed;同状态内最新的排前 + .last("ORDER BY FIELD(status,'pending','assigned','processing','resolved','closed','rejected'), create_time DESC"); baseMapper.selectPage(page, wrapper); return new PageResult<>(page.getRecords(), page.getTotal()); @@ -105,8 +106,8 @@ public class AppTicketServiceImpl extends ServiceImpl q.like(AppTicket::getTitle, param.getKeywords()) .or().like(AppTicket::getTicketNo, param.getKeywords())) - .orderByAsc(AppTicket::getStatus) // pending 排前面 - .orderByDesc(AppTicket::getCreateTime); + // 状态优先级 > 紧急程度 > 最新提交时间 + .last("ORDER BY FIELD(status,'pending','assigned','processing','resolved','closed','rejected'), FIELD(priority,'urgent','high','normal','low'), create_time DESC"); baseMapper.selectPage(page, wrapper); return new PageResult<>(page.getRecords(), page.getTotal());