From 73965ebe7cbf0d8bd606248ac972de4e89f0c4c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Tue, 14 Mar 2023 15:50:47 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=20bug=E3=80=91querylist=E6=96=B9?= =?UTF-8?q?=E6=B3=95=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/${entityName}Controller.javai | 11 +++++++---- .../service/I${entityName}Service.javai | 4 +++- .../service/impl/${entityName}ServiceImpl.javai | 6 ++++-- .../controller/${entityName}Controller.javai | 17 +++++++++-------- .../service/I${entityName}Service.javai | 3 ++- .../service/impl/${entityName}ServiceImpl.javai | 5 +++-- 6 files changed, 28 insertions(+), 18 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai index 24de95d4..a71d5b6a 100644 --- a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai +++ b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai @@ -41,7 +41,7 @@ import com.jero.common.aspect.annotation.AutoLog; public class ${entityName}Controller extends JeroController<${entityName}, I${entityName}Service> { @Autowired private I${entityName}Service ${entityName?uncap_first}Service; - + /** * 分页列表查询 * @@ -59,7 +59,7 @@ public class ${entityName}Controller extends JeroController<${entityName}, I${en @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { QueryWrapper<${entityName}> queryWrapper = QueryGenerator.initQueryWrapper(${entityName?uncap_first}, req.getParameterMap()); - Page<${entityName}> page = new Page<${entityName}>(pageNo, pageSize); + Page<${entityName}> page = new Page<>(pageNo, pageSize); IPage<${entityName}> pageList = ${entityName?uncap_first}Service.page(page, queryWrapper); return Result.OK(pageList); } @@ -67,13 +67,16 @@ public class ${entityName}Controller extends JeroController<${entityName}, I${en /** * 列表查询 * + * @param ${entityName?uncap_first} + * @param req * @return */ @AutoLog(value = "${tableVo.ftlDescription}-列表查询") @ApiOperation(value="${tableVo.ftlDescription}-列表查询", notes="${tableVo.ftlDescription}-列表查询") @GetMapping(value = "/list") - public Result> queryList() { - List<${entityName}> list = ${entityName?uncap_first}Service.queryList(); + public Result> queryList(${entityName} ${entityName?uncap_first}, HttpServletRequest req) { + QueryWrapper<${entityName}> queryWrapper = QueryGenerator.initQueryWrapper(${entityName?uncap_first}, req.getParameterMap()); + List<${entityName}> list = ${entityName?uncap_first}Service.queryList(queryWrapper); return Result.OK(list); } diff --git a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai index 51a1a7fb..0070b225 100644 --- a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai +++ b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai @@ -1,5 +1,6 @@ package ${bussiPackage}.${entityPackage}.service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import ${bussiPackage}.${entityPackage}.entity.${entityName}; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -55,7 +56,8 @@ public interface I${entityName}Service extends IService<${entityName}> { /** * 列表查询 * + * @param queryWrapper * @return */ - List<${entityName}> queryList(); + List<${entityName}> queryList(QueryWrapper<${entityName}> queryWrapper); } diff --git a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai index 9156315f..0bae848c 100644 --- a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai +++ b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai @@ -9,6 +9,7 @@ import com.jero.common.exception.JeroBootException; import java.util.List; import java.util.Date; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; /** * @Description: ${tableVo.ftlDescription} @@ -83,10 +84,11 @@ public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, $ /** * 列表查询 * + * @param queryWrapper * @return */ @Override - public List<${entityName}> queryList() { - return list(); + public List<${entityName}> queryList(QueryWrapper<${entityName}> queryWrapper) { + return list(queryWrapper); } } diff --git a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai index 3f4c10b6..62f91a9c 100644 --- a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai +++ b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai @@ -48,7 +48,7 @@ import io.swagger.annotations.ApiOperation; public class ${entityName}Controller extends JeroController<${entityName}, I${entityName}Service> { @Autowired private I${entityName}Service ${entityName?uncap_first}Service; - + /** * 分页列表查询 * @@ -66,7 +66,7 @@ public class ${entityName}Controller extends JeroController<${entityName}, I${en @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { QueryWrapper<${entityName}> queryWrapper = QueryGenerator.initQueryWrapper(${entityName?uncap_first}, req.getParameterMap()); - Page<${entityName}> page = new Page<${entityName}>(pageNo, pageSize); + Page<${entityName}> page = new Page<>(pageNo, pageSize); IPage<${entityName}> pageList = ${entityName?uncap_first}Service.page(page, queryWrapper); return Result.OK(pageList); } @@ -79,8 +79,9 @@ public class ${entityName}Controller extends JeroController<${entityName}, I${en @AutoLog(value = "${tableVo.ftlDescription}-列表查询") @ApiOperation(value="${tableVo.ftlDescription}-列表查询", notes="${tableVo.ftlDescription}-列表查询") @GetMapping(value = "/list") - public Result> queryList() { - List list = ${entityName?uncap_first}Service.queryList(); + public Result> queryList(${entityName} ${entityName?uncap_first}, HttpServletRequest req) { + QueryWrapper<${entityName}> queryWrapper = QueryGenerator.initQueryWrapper(${entityName?uncap_first}, req.getParameterMap()); + List list = ${entityName?uncap_first}Service.queryList(queryWrapper); return Result.OK(list); } @@ -97,7 +98,7 @@ public class ${entityName}Controller extends JeroController<${entityName}, I${en ${entityName?uncap_first}Service.add(${entityName?uncap_first}); return Result.OK("操作成功!"); } - + /** * 编辑 * @@ -111,7 +112,7 @@ public class ${entityName}Controller extends JeroController<${entityName}, I${en ${entityName?uncap_first}Service.editById(${entityName?uncap_first}); return Result.OK("操作成功!"); } - + /** * 通过id删除 * @@ -125,7 +126,7 @@ public class ${entityName}Controller extends JeroController<${entityName}, I${en ${entityName?uncap_first}Service.deleteById(id); return Result.OK("删除成功!"); } - + /** * 批量删除 * @@ -139,7 +140,7 @@ public class ${entityName}Controller extends JeroController<${entityName}, I${en this.${entityName?uncap_first}Service.deleteByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功！"); } - + /** * 通过id查询 * diff --git a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai index 4d5472ec..16b00f4f 100644 --- a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai +++ b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai @@ -54,7 +54,8 @@ public interface I${entityName}Service extends IService<${entityName}> { /** * 列表查询 * + * @param queryWrapper * @return */ - List<${entityName}> queryList(); + List<${entityName}> queryList(QueryWrapper<${entityName}> queryWrapper); } diff --git a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai index d92cdf6e..e5468e06 100644 --- a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai +++ b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai @@ -76,10 +76,11 @@ public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, $ /** * 列表查询 * + * @param queryWrapper * @return */ @Override - List<${entityName}> queryList() { - return list(); + List<${entityName}> queryList(QueryWrapper<${entityName}> queryWrapper) { + return list(queryWrapper); } }