diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/controller/WjxWjxxTmlbController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/controller/WjxWjxxTmlbController.java index 9e6186e2..27c5ae2c 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/controller/WjxWjxxTmlbController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/controller/WjxWjxxTmlbController.java @@ -88,6 +88,26 @@ public class WjxWjxxTmlbController { return Result.OK(pageList); } + + @ApiOperation(value="题目信息-分页列表查询", notes="题目信息-分页列表查询") + @GetMapping(value = "/distinctList") + public Result> distinctList(WjxWjxxTmlb wjxWjxxTmlb, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(wjxWjxxTmlb, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + queryWrapper.groupBy("wj_title,wj_score,wj_sytype,wj_type"); + IPage pageList = wjxWjxxTmlbService.distinctList(page, queryWrapper); + if(pageList.getRecords()!=null){ + for(WjxWjxxTmlb par:pageList.getRecords()){ + List wjxWjxxTmxxList = wjxWjxxTmxxService.selectByMainId(par.getId()); + par.setWjxWjxxTmxxList(wjxWjxxTmxxList); + } + } + + return Result.OK(pageList); + } /** * 添加 diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/mapper/WjxWjxxTmlbMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/mapper/WjxWjxxTmlbMapper.java index 9cb946cd..8621c21e 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/mapper/WjxWjxxTmlbMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/mapper/WjxWjxxTmlbMapper.java @@ -2,6 +2,10 @@ package org.jeecg.modules.kc.wjxWjxxTmlb.mapper; import java.util.List; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.jeecg.modules.kc.wjxWjxxTmlb.entity.WjxWjxxTmlb; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -14,4 +18,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface WjxWjxxTmlbMapper extends BaseMapper { + IPage distinctList(Page page,@Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/mapper/xml/WjxWjxxTmlbMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/mapper/xml/WjxWjxxTmlbMapper.xml index 54f30b11..f5592d49 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/mapper/xml/WjxWjxxTmlbMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/mapper/xml/WjxWjxxTmlbMapper.xml @@ -2,4 +2,9 @@ + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/service/IWjxWjxxTmlbService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/service/IWjxWjxxTmlbService.java index 586fb64b..640d6bd1 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/service/IWjxWjxxTmlbService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/service/IWjxWjxxTmlbService.java @@ -1,5 +1,8 @@ package org.jeecg.modules.kc.wjxWjxxTmlb.service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.jeecg.modules.kc.wjxWjxxTmlb.entity.WjxWjxxTmxx; import org.jeecg.modules.kc.wjxWjxxTmlb.entity.WjxWjxxTmlb; import com.baomidou.mybatisplus.extension.service.IService; @@ -50,4 +53,6 @@ public interface IWjxWjxxTmlbService extends IService { List queryByMainId(String id); List queryDjByMainId(String id); + + IPage distinctList(Page page, QueryWrapper queryWrapper); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/service/impl/WjxWjxxTmlbServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/service/impl/WjxWjxxTmlbServiceImpl.java index 00096dc6..d944c551 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/service/impl/WjxWjxxTmlbServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/service/impl/WjxWjxxTmlbServiceImpl.java @@ -1,6 +1,8 @@ package org.jeecg.modules.kc.wjxWjxxTmlb.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.commons.lang3.StringUtils; import org.jeecg.modules.kc.wjxWjxxTmlb.entity.WjxWjxxTmlb; import org.jeecg.modules.kc.wjxWjxxTmlb.entity.WjxWjxxTmxx; @@ -132,4 +134,9 @@ public class WjxWjxxTmlbServiceImpl extends ServiceImpl distinctList(Page page, QueryWrapper queryWrapper) { + return baseMapper.distinctList(page,queryWrapper); + } + }