admin分页

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformanceAdminListParam.java

@@ -40,18 +40,18 @@ public class PerformanceAdminListParam {
         this.stopSellTime = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").format(now.plusDays(-stopSellDay));
     }
 
-    @ApiModelProperty(hidden = true)
-    private Integer page;
-    @ApiModelProperty(hidden = true)
-    private Integer size;
-
-    public void setPageNum(Integer pageNum){
-        this.pageNum=pageNum;
-        this.page=pageNum;
-    }
-
-    public void setPageSize(Integer pageSize){
-        this.pageSize=pageSize;
-        this.size=pageSize;
-    }
+//    @ApiModelProperty(hidden = true)
+//    private Integer page;
+//    @ApiModelProperty(hidden = true)
+//    private Integer size;
+//
+//    public void setPageNum(Integer pageNum){
+//        this.pageNum=pageNum;
+//        this.page=pageNum;
+//    }
+//
+//    public void setPageSize(Integer pageSize){
+//        this.pageSize=pageSize;
+//        this.size=pageSize;
+//    }
 }

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/admin/IKylinPerformancesAdminService.java

@@ -47,7 +47,7 @@ public interface IKylinPerformancesAdminService extends IService<KylinPerformanc
      * @param performanceAdminListParam 列表搜索参数
      * @return 分页 sql 数据
      */
-    List<PerformanceAdminListDao> getList(PerformanceAdminListParam performanceAdminListParam);
+    PageInfo<PerformanceAdminListDao> getList(PerformanceAdminListParam performanceAdminListParam);
 
     /**
      * 根据巡演id 查询演出列表 简易

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinPerformancesController.java

@@ -60,9 +60,12 @@ public class KylinPerformancesController extends BaseController {
     @PostMapping("/list")
     @ResponseBody
     public TableDataInfo list(PerformanceAdminListParam performanceAdminListParam) {
-        startPage();/**/
-        List<PerformanceAdminListDao> result = kylinPerformancesService.getList(performanceAdminListParam);
-        return getDataTable(result);
+        PageInfo<PerformanceAdminListDao> result = kylinPerformancesService.getList(performanceAdminListParam);
+        TableDataInfo rspData = new TableDataInfo();
+        rspData.setCode(0);
+        rspData.setRows(result.getList());
+        rspData.setTotal(result.getTotal());
+        return rspData;
     }
 
     @RequiresPermissions("kylin:performances:detail")
@@ -151,8 +154,8 @@ public class KylinPerformancesController extends BaseController {
     @RequiresPermissions("kylin:performances:agent")
     @PostMapping(value = "/agent/change")
     @ResponseBody
-    public AjaxResult changeTicketAgent(@RequestParam("performancesId") String performancesId,@RequestParam("ticketsId") String ticketsId, @RequestParam("status") Integer status) {
-        boolean result = kylinPerformancesService.changeTicketAgent(performancesId,ticketsId, status);
+    public AjaxResult changeTicketAgent(@RequestParam("performancesId") String performancesId, @RequestParam("ticketsId") String ticketsId, @RequestParam("status") Integer status) {
+        boolean result = kylinPerformancesService.changeTicketAgent(performancesId, ticketsId, status);
         return toAjax(result);
     }
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/static/ruoyi/js/ry-ui.js

@@ -1705,4 +1705,4 @@ modal_status = {
     SUCCESS: "success",
     FAIL: "error",
     WARNING: "warning"
-};
+};
\ No newline at end of file

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/system/dict/type/type.html

@@ -36,7 +36,7 @@
 					</div>
 				</form>
 			</div>
-			
+
 	       <div class="btn-group-sm" id="toolbar" role="group">
 	            <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:dict:add">
 	                <i class="fa fa-plus"></i> 新增
@@ -54,7 +54,7 @@
 		            <i class="fa fa-refresh"></i> 清理缓存
 		        </a>
 	        </div>
-	        
+
 	        <div class="col-sm-12 select-table table-striped">
 			    <table id="bootstrap-table"></table>
 			</div>
@@ -138,11 +138,11 @@
 		    var url = prefix + '/detail/' + dictId;
 		    $.modal.openTab("字典数据", url);
 		}
-		
+
 		/** 清理字典缓存 */
         function clearCache() {
             $.operate.get(prefix + "/clearCache");
         }
 	</script>
 </body>
-</html>
+</html>
\ No newline at end of file

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinPerformancesAdminServiceImpl.java

@@ -201,14 +201,12 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
     }
 
     @Override
-    public List<PerformanceAdminListDao> getList(PerformanceAdminListParam performanceAdminListParam) {
+    public PageInfo<PerformanceAdminListDao> getList(PerformanceAdminListParam performanceAdminListParam) {
+        PageInfo<PerformanceAdminListDao> pageInfo;
         List<PerformanceAdminListDao> newList = new ArrayList();
         try {
             Map<String, Object> map = BeanUtil.convertBeanToMap(performanceAdminListParam);
             List<PerformanceAdminListDao> voList = performancesMapper.misPerformanceList(map);
-
-
-
             for (PerformanceAdminListDao item : voList) {
                 item.setStatus(item.getStatus());
                 if(item.getStatus() >=6 && item.getStatus()!=7){
@@ -222,11 +220,12 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
                 }
                 newList.add(item);
             }
+            pageInfo = new PageInfo(voList);
         } catch (Exception e) {
             e.printStackTrace();
             return null;
         }
-        return newList;
+        return pageInfo;
     }
 
     @Override