zouxuan 3 gadi atpakaļ
vecāks
revīzija
0c2ca8a5a0

+ 2 - 1
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/ImGroupNoticeDao.java

@@ -3,6 +3,7 @@ package com.yonge.cooleshow.biz.dal.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yonge.cooleshow.biz.dal.dto.ImGroupNoticeDto;
 import com.yonge.cooleshow.biz.dal.entity.ImGroupNotice;
 import org.apache.ibatis.annotations.Param;
 
@@ -19,6 +20,6 @@ public interface ImGroupNoticeDao extends BaseMapper<ImGroupNotice> {
 
     int insertBatch(@Param("entities") List<ImGroupNotice> entities);
 
-    IPage<ImGroupNotice> queryPage(Page<ImGroupNotice> pageInfo, @Param("params") Map<String, Object> params);
+    IPage<ImGroupNoticeDto> queryPage(Page<ImGroupNoticeDto> pageInfo, @Param("params") Map<String, Object> params);
 }
 

+ 2 - 1
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/ImGroupNoticeService.java

@@ -3,6 +3,7 @@ package com.yonge.cooleshow.biz.dal.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yonge.cooleshow.biz.dal.dao.ImGroupNoticeDao;
+import com.yonge.cooleshow.biz.dal.dto.ImGroupNoticeDto;
 import com.yonge.cooleshow.biz.dal.entity.ImGroupNotice;
 import com.yonge.cooleshow.common.page.PageInfo;
 
@@ -31,6 +32,6 @@ public interface ImGroupNoticeService extends IService<ImGroupNotice> {
 
     void del(Long noticeId);
 
-    PageInfo<ImGroupNotice> queryPage(Map<String,Object> params);
+    PageInfo<ImGroupNoticeDto> queryPage(Map<String,Object> params);
 }
 

+ 3 - 2
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ImGroupNoticeServiceImpl.java

@@ -6,6 +6,7 @@ import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dao.ImGroupDao;
 import com.yonge.cooleshow.biz.dal.dao.ImGroupNoticeDao;
+import com.yonge.cooleshow.biz.dal.dto.ImGroupNoticeDto;
 import com.yonge.cooleshow.biz.dal.entity.ImGroup;
 import com.yonge.cooleshow.biz.dal.entity.ImGroupNotice;
 import com.yonge.cooleshow.biz.dal.service.ImGroupNoticeService;
@@ -65,8 +66,8 @@ public class ImGroupNoticeServiceImpl extends ServiceImpl<ImGroupNoticeDao, ImGr
     }
 
     @Override
-    public PageInfo<ImGroupNotice> queryPage(Map<String,Object> params) {
-        Page<ImGroupNotice> pageInfo = PageUtil.getPageInfo(params);
+    public PageInfo<ImGroupNoticeDto> queryPage(Map<String,Object> params) {
+        Page<ImGroupNoticeDto> pageInfo = PageUtil.getPageInfo(params);
         pageInfo.setDesc("top_flag_","id_");
         return PageUtil.pageInfo(baseMapper.queryPage(pageInfo,params));
     }

+ 3 - 1
cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/ImGroupNoticeController.java

@@ -4,6 +4,8 @@ package com.yonge.cooleshow.teacher.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yonge.cooleshow.biz.dal.dao.ImGroupNoticeDao;
+import com.yonge.cooleshow.biz.dal.dto.ImGroupNoticeDto;
 import com.yonge.cooleshow.biz.dal.entity.ImGroupNotice;
 import com.yonge.cooleshow.biz.dal.service.ImGroupNoticeService;
 import com.yonge.cooleshow.biz.dal.support.PageUtil;
@@ -62,7 +64,7 @@ public class ImGroupNoticeController extends BaseController {
     })
     @ApiOperation("分页查询")
     @PostMapping(value = "/queryPage")
-    public HttpResponseResult<PageInfo<ImGroupNotice>> queryPage(@RequestBody Map<String,Object> params) throws Exception {
+    public HttpResponseResult<PageInfo<ImGroupNoticeDto>> queryPage(@RequestBody Map<String,Object> params) throws Exception {
         return succeed(imGroupNoticeService.queryPage(params));
     }
 }