dd

ruoyi-admin/src/main/java/com/ruoyi/web/controller/subsidy/SubsidyQueueController.java

@@ -96,6 +96,7 @@ public class SubsidyQueueController extends BaseController {
     @SaCheckPermission("subsidy:subsidyQueue:businessPage")
     @GetMapping("/business-page")
     public TableDataInfo<SubsidyQueueVo> businessPage(@Validated(QueryGroup.class) SubsidyQueueBo bo, PageQuery pageQuery) {
+        bo.setIsAsc("asc");
         bo.setCurrentBusinessId(getBusinessId( true));
         return iSubsidyQueueService.queryPageList(bo, pageQuery);
     }
@@ -215,6 +216,7 @@ public class SubsidyQueueController extends BaseController {
     @PostMapping("/business-export")
     public void businessExport(@Validated SubsidyQueueBo bo, HttpServletResponse response) {
         bo.setCurrentBusinessId(getBusinessId( true));
+        bo.setIsAsc("asc");
         List<SubsidyQueueVo> list = iSubsidyQueueService.queryList(bo);
         ExcelUtil.exportExcel(list, "排队订单", SubsidyQueueVo.class, response);
     }

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

@@ -61,6 +61,7 @@ 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);
     }
 
@@ -101,6 +102,7 @@ public class ApiSubsidyQueueController extends AbstractApiController {
     @ApiOperation("导出补贴排队列表")
     @PostMapping("/export")
     public void export(@Validated SubsidyQueueBo bo, HttpServletResponse response) {
+        bo.setIsAsc("asc");
         List<SubsidyQueueVo> list = iSubsidyQueueService.queryList(bo);
         ExcelUtil.exportExcel(list, "补贴排队", SubsidyQueueVo.class, response);
     }

ruoyi-line/src/main/java/com/ruoyi/subsidy/domain/bo/SubsidyQueueBo.java

@@ -320,7 +320,7 @@ public class SubsidyQueueBo extends BaseTimeEntity {
      * 排序的方向desc或者asc
      */
     @ApiModelProperty(value = "排序的方向")
-    private String isAsc = "asc";
+    private String isAsc;
 
     /**
      * 连锁商家IDs
@@ -345,4 +345,7 @@ public class SubsidyQueueBo extends BaseTimeEntity {
      */
     @ApiModelProperty(value = "是否迁移")
     private Boolean moved;
+
+
+
 }

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

@@ -202,9 +202,12 @@ public class SubsidyQueueServiceImpl implements ISubsidyQueueService {
 
 
         if ("asc".equals(bo.getIsAsc())) {
+            lqw.orderByAsc(SubsidyQueue::getSubsidyStatus);
             lqw.orderByAsc(SubsidyQueue::getQueueOrder);
-        } else {
-            lqw.orderByDesc(SubsidyQueue::getQueueOrder);
+            lqw.orderByAsc(SubsidyQueue::getQueueTime);
+        }
+        else {
+            lqw.orderByDesc(SubsidyQueue::getQueueTime);
         }
         return lqw;
     }