用户 组织 演出 分页展示修改

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileOrganizationController.java

@@ -34,11 +34,7 @@ public class SmileOrganizationController {
     @ApiOperation("获取组织列表")
     @ResponseBody
     public TableDataInfo organizationList(SmileOrganizationParam smileOrganizationParam){
-        PageInfo<SmileOrganizationVo> organizationList = smileOrganizationService.organizationList(smileOrganizationParam);
-        TableDataInfo rspData = new TableDataInfo();
-        rspData.setCode(0);
-        rspData.setRows(organizationList.getList());
-        rspData.setTotal(organizationList.getTotal());
+        TableDataInfo organizationList = smileOrganizationService.organizationList(smileOrganizationParam);
         return rspData;
     }
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileShowController.java

@@ -29,11 +29,7 @@ public class SmileShowController {
     @ApiOperation("演出列表")
     @ResponseBody
     public TableDataInfo schoolList(SmileShowParam smileShowParam) {
-        PageInfo<ShowVo> list = smileShowService.listShow(smileShowParam);
-        TableDataInfo rspData = new TableDataInfo();
-        rspData.setCode(0);
-        rspData.setRows(list.getList());
-        rspData.setTotal(list.getTotal());
+        TableDataInfo rspData = smileShowService.listShow(smileShowParam);
         return rspData;
     }
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileUserController.java

@@ -39,11 +39,7 @@ public class SmileUserController extends BaseController {
     @ApiOperation(value = "获取用户列表")
     @ResponseBody
     public TableDataInfo userList(SmileUserParam smileUserParam) {
-        PageInfo<SmileUserVo> smileUserVos = iSmileUserService.userList(smileUserParam);
-        TableDataInfo rspData = new TableDataInfo();
-        rspData.setCode(0);
-        rspData.setRows(smileUserVos.getList());
-        rspData.setTotal(smileUserVos.getTotal());
+        TableDataInfo rspData = iSmileUserService.userList(smileUserParam);
         return rspData;
     }
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/ISmileOrganizationService.java

@@ -4,6 +4,7 @@ package com.liquidnet.client.admin.zhengzai.smile.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
+import com.liquidnet.client.admin.common.core.page.TableDataInfo;
 import com.liquidnet.client.admin.zhengzai.smile.dto.SmileOrgAndUserVo;
 import com.liquidnet.client.admin.zhengzai.smile.dto.SmileOrganizationParam;
 import com.liquidnet.client.admin.zhengzai.smile.dto.SmileOrganizationVo;
@@ -19,7 +20,7 @@ import com.liquidnet.service.smile.entity.SmileOrganization;
  */
 public interface ISmileOrganizationService extends IService<SmileOrganization> {
 
-    PageInfo<SmileOrganizationVo> organizationList(SmileOrganizationParam smileOrganizationParam);
+    TableDataInfo organizationList(SmileOrganizationParam smileOrganizationParam);
 
     AjaxResult create(SmileOrganizationVo smileOrganizationVo);
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/ISmileShowService.java

@@ -2,10 +2,9 @@ package com.liquidnet.client.admin.zhengzai.smile.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.github.pagehelper.PageInfo;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
+import com.liquidnet.client.admin.common.core.page.TableDataInfo;
 import com.liquidnet.client.admin.zhengzai.smile.dto.ShowSort;
-import com.liquidnet.client.admin.zhengzai.smile.dto.ShowVo;
 import com.liquidnet.client.admin.zhengzai.smile.dto.SmilePriceParam;
 import com.liquidnet.client.admin.zhengzai.smile.dto.SmileShowParam;
 import com.liquidnet.service.smile.entity.SmileSchool;
@@ -20,7 +19,7 @@ import com.liquidnet.service.smile.entity.SmileSchool;
  */
 public interface ISmileShowService extends IService<SmileSchool> {
 
-    PageInfo<ShowVo> listShow(SmileShowParam smileShowParam);
+    TableDataInfo listShow(SmileShowParam smileShowParam);
 
     AjaxResult sort(ShowSort showSort);
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/ISmileUserService.java

@@ -4,6 +4,7 @@ package com.liquidnet.client.admin.zhengzai.smile.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
+import com.liquidnet.client.admin.common.core.page.TableDataInfo;
 import com.liquidnet.client.admin.zhengzai.smile.dto.*;
 import com.liquidnet.service.smile.entity.SmileUser;
 import com.liquidnet.service.smile.entity.dao.SmileUserCheckDao;
@@ -12,7 +13,7 @@ import java.util.List;
 
 public interface ISmileUserService extends IService<SmileUser> {
 
-    PageInfo<SmileUserVo> userList(SmileUserParam smileUserParam);
+    TableDataInfo userList(SmileUserParam smileUserParam);
 
     SmileUser getUserById(String id);
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileOrganizationServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
+import com.liquidnet.client.admin.common.core.page.TableDataInfo;
 import com.liquidnet.client.admin.common.utils.StringUtils;
 import com.liquidnet.client.admin.common.utils.bean.BeanUtils;
 import com.liquidnet.client.admin.zhengzai.smile.dto.SmileOrgAndUserVo;
@@ -52,11 +53,13 @@ public class SmileOrganizationServiceImpl extends ServiceImpl<SmileOrganizationM
     SmileRedisUtils smileRedisUtils;
 
     @Override
-    public PageInfo<SmileOrganizationVo> organizationList(SmileOrganizationParam smileOrganizationParam) {
-        PageInfo<SmileOrganizationVo> pageInfo;
+    public TableDataInfo organizationList(SmileOrganizationParam smileOrganizationParam) {
+        PageInfo<SmileOrganization> pageInfo;
+        TableDataInfo rspData = new TableDataInfo();
         try {
             Map<String, Object> map = BeanUtil.convertBeanToMap(smileOrganizationParam);
             List<SmileOrganization> smileOrganizations = smileOrganizationMapper.selectOrganizationList(map);
+            pageInfo = new PageInfo<>(smileOrganizations);
             List<SmileOrganizationVo> smileOrganizationVos = smileOrganizations.stream().map(smileOrganization -> {
                 SmileOrganizationVo smileOrganizationVo = new SmileOrganizationVo();
                 BeanUtils.copyProperties(smileOrganization, smileOrganizationVo);
@@ -72,12 +75,14 @@ public class SmileOrganizationServiceImpl extends ServiceImpl<SmileOrganizationM
                 smileOrganizationVo.setProper(smileUserMapper.strip(smileOrganization.getId()));
                 return smileOrganizationVo;
             }).collect(Collectors.toList());
-            pageInfo = new PageInfo<>(smileOrganizationVos);
+            rspData.setCode(0);
+            rspData.setRows(smileOrganizationVos);
+            rspData.setTotal(pageInfo.getTotal());
         } catch (Exception e) {
             e.printStackTrace();
             return null;
         }
-        return pageInfo;
+        return rspData;
     }
 
     @Override

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileShowServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
+import com.liquidnet.client.admin.common.core.page.TableDataInfo;
 import com.liquidnet.client.admin.common.utils.StringUtils;
 import com.liquidnet.client.admin.zhengzai.smile.dto.*;
 import com.liquidnet.client.admin.zhengzai.smile.service.ISmileShowService;
@@ -91,10 +92,12 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
     KylinPerformanceStatusMapper kylinPerformanceStatusMapper;
 
     @Override
-    public PageInfo<ShowVo> listShow(SmileShowParam smileShowParam) {
-        PageInfo<ShowVo> pageInfo;
+    public TableDataInfo listShow(SmileShowParam smileShowParam) {
+        PageInfo<KylinPerformances> pageInfo;
+        TableDataInfo rspData = new TableDataInfo();
         //查询所有代理的演出id
         List<KylinPerformances> kylinPerformancesList = kylinPerformancesMapper.selectPerIdByAgent();
+        pageInfo = new PageInfo<>(kylinPerformancesList);
         List<ShowVo> showVoList = kylinPerformancesList.stream().map(kylinPerformances -> {
             ShowVo vo = new ShowVo();
             //演出id
@@ -142,8 +145,10 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
 
             return vo;
         }).collect(Collectors.toList());
-        pageInfo = new PageInfo<>(showVoList);
-        return pageInfo;
+        rspData.setCode(0);
+        rspData.setRows(showVoList);
+        rspData.setTotal(pageInfo.getTotal());
+        return rspData;
     }
 
     @Override

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileUserServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
+import com.liquidnet.client.admin.common.core.page.TableDataInfo;
 import com.liquidnet.client.admin.common.utils.StringUtils;
 import com.liquidnet.client.admin.zhengzai.smile.dto.*;
 import com.liquidnet.client.admin.zhengzai.smile.service.ISmileUserService;
@@ -50,25 +51,30 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
     SmileSchoolMapper smileSchoolMapper;
 
     @Override
-    public PageInfo<SmileUserVo> userList(SmileUserParam smileUserParam) {
-        PageInfo<SmileUserVo> pageInfo;
+    public TableDataInfo userList(SmileUserParam smileUserParam) {
+        PageInfo<SmileUser> pageInfo;
+        TableDataInfo rspData = new TableDataInfo();
         try {
             //查询通过审核通过的用户 type！=0、1   未删除用户
             Map<String, Object> map = BeanUtil.convertBeanToMap(smileUserParam);
-            List<SmileUserVo> smileUserVos = smileUserMapper.selectUserList(map).stream().map(smileUser -> {
+            List<SmileUser> smileUsers = smileUserMapper.selectUserList(map);
+            pageInfo = new PageInfo<SmileUser>(smileUsers);
+            List<SmileUserVo> smileUserVos = smileUsers.stream().map(smileUser -> {
                 //获取学校名
                 SmileUserVo smileUserVo = new SmileUserVo();
                 BeanUtils.copyProperties(smileUser, smileUserVo);
                 smileUserVo.setSchoolName(getSchoolNameById(smileUser.getSchoolId()));
-
                 return smileUserVo;
             }).collect(Collectors.toList());
-            pageInfo = new PageInfo<SmileUserVo>(smileUserVos);
+
+            rspData.setCode(0);
+            rspData.setRows(smileUserVos);
+            rspData.setTotal(pageInfo.getTotal());
         } catch (Exception e) {
             e.printStackTrace();
             return null;
         }
-        return pageInfo;
+        return rspData;
     }
 
     private String getSchoolNameById(String schoolId) {