ソースを参照

fix 直播分页

tanzh 3 年 前
コミット
d4a3cb84d6

+ 11 - 1
zhongzheng-api/src/main/java/com/zhongzheng/controller/mock/MockApplyController.java

@@ -145,11 +145,21 @@ public class MockApplyController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:apply:list')")
     @GetMapping("/listMockLive")
     public TableDataInfo<MockMajorSubjectVo> listMockLive(MockApplyQueryBo bo) {
+        Integer pageNum = 0;
+        Integer pageSize = 0;
+        if (Validator.isNotEmpty(bo.getPageNum()) && Validator.isNotEmpty(bo.getPageSize())) {
+            pageNum = bo.getPageNum();
+            pageSize = bo.getPageSize();
+            bo.setPageNum(null);
+            bo.setPageSize(null);
+        }
         List<MockMajorSubjectVo> list = iMockApplyService.listMockLive(bo);
+        bo.setPageNum(pageNum);
+        bo.setPageSize(pageSize);
         if (Validator.isEmpty(bo.getPageNum()) || Validator.isEmpty(bo.getPageSize())) {
             return getDataTable(list);
         }
-        return getDataTable(getPageInfo(bo.getPageNum(), bo.getPageSize(), list).getList());
+        return getDataTable(getPageInfo(pageNum, pageSize, list).getList());
     }
 
     /**

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/service/impl/MockApplyServiceImpl.java

@@ -502,7 +502,7 @@ public class MockApplyServiceImpl extends ServiceImpl<MockApplyMapper, MockApply
                         mockApplyVo.setLiveStatus(2);
                         playBackList.add(mockApplyVo);
                     }
-                    if (System.currentTimeMillis() / 1000 > mockApplyVo.getLiveEndTime()) {
+                    if (System.currentTimeMillis() / 1000 > mockApplyVo.getLiveEndTime() && mockApplyVo.getSectionType() != 3) {
                         mockApplyVo.setLiveStatus(3);
                         overList.add(mockApplyVo);
                     }