dd

ruoyi-api/src/main/java/com/ruoyi/api/controller/line/ApiSubsidyQueueController.java

@@ -61,7 +61,6 @@ public class ApiSubsidyQueueController extends AbstractApiController {
     @GetMapping("/business-page")
     public TableDataInfo<SubsidyQueueVo> businessPage(@Validated(QueryGroup.class) SubsidyQueueBo bo, PageQuery pageQuery) {
         bo.setCurrentBusinessId(getBusinessByUserId(getUserId(true), true));
-        bo.setIsAsc("asc");
         return iSubsidyQueueService.queryPageList(bo, pageQuery);
     }
 

ruoyi-line/src/main/java/com/ruoyi/subsidy/service/impl/SubsidyQueueServiceImpl.java

@@ -213,6 +213,11 @@ public class SubsidyQueueServiceImpl implements ISubsidyQueueService {
             lqw.orderByAsc(SubsidyQueue::getQueueOrder);
             lqw.orderByAsc(SubsidyQueue::getQueueTime);
         }
+        else if ("desc".equals(bo.getIsAsc())) {
+            lqw.orderByAsc(SubsidyQueue::getSubsidyStatus);
+            lqw.orderByDesc(SubsidyQueue::getQueueOrder);
+            lqw.orderByAsc(SubsidyQueue::getQueueTime);
+        }
         else {
             lqw.orderByDesc(SubsidyQueue::getQueueTime);
         }