diff --git a/src/main/java/com/cool/core/base/BaseService.java b/src/main/java/com/cool/core/base/BaseService.java index 52db046..a199f27 100644 --- a/src/main/java/com/cool/core/base/BaseService.java +++ b/src/main/java/com/cool/core/base/BaseService.java @@ -4,7 +4,6 @@ import cn.hutool.json.JSONObject; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.core.service.IService; - import java.util.List; /** @@ -77,6 +76,15 @@ public interface BaseService extends IService { */ Object list(JSONObject requestParams, QueryWrapper queryWrapper); + /** + * 查询所有 + * 带关联查询 + * @param requestParams 请求参数 + * @param queryWrapper 查询条件 + * @return 列表信息 + */ + Object listWithRelations(JSONObject requestParams, QueryWrapper queryWrapper); + /** * 分页查询 * @@ -87,6 +95,16 @@ public interface BaseService extends IService { */ Object page(JSONObject requestParams, Page page, QueryWrapper queryWrapper); + /** + * 分页查询 + * 带关联查询 + * @param requestParams 请求参数 + * @param page 分页信息 + * @param queryWrapper 查询条件 + * @return 分页信息 + */ + Object pageWithRelations(JSONObject requestParams, Page page, QueryWrapper queryWrapper); + /** * 查询信息 * diff --git a/src/main/java/com/cool/core/base/BaseServiceImpl.java b/src/main/java/com/cool/core/base/BaseServiceImpl.java index 81abfb0..2969d3d 100644 --- a/src/main/java/com/cool/core/base/BaseServiceImpl.java +++ b/src/main/java/com/cool/core/base/BaseServiceImpl.java @@ -78,11 +78,22 @@ public class BaseServiceImpl, T extends BaseEntity> e return this.list(queryWrapper); } + @Override + public Object listWithRelations(JSONObject requestParams, QueryWrapper queryWrapper) { + return mapper.selectListWithRelationsByQuery(queryWrapper); + } + @Override public Object page(JSONObject requestParams, Page page, QueryWrapper queryWrapper) { return this.page(page, queryWrapper); } + @Override + public Object pageWithRelations(JSONObject requestParams, Page page, + QueryWrapper queryWrapper) { + return mapper.paginateWithRelations(page, queryWrapper); + } + @Override public Object info(JSONObject requestParams, Long id) { return info(id);