diff --git a/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai index 3ef1a5055..1ee6cdcc7 100644 --- a/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai +++ b/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai @@ -67,8 +67,8 @@ public class ${entityName}Controller { @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), }) @GetMapping(value = "/page") - public Result> queryPageList(@ApiIgnore @RequestParam HashMap paramMap) { - return Result.success(${entityName?uncap_first}Service.queryPageList(paramMap)); + public Result> queryPageList(@ApiIgnore @RequestParam HashMap param) { + return Result.success(${entityName?uncap_first}Service.queryPageList(param)); } /** @@ -77,8 +77,8 @@ public class ${entityName}Controller { */ @ApiOperation(value = "列表查询${tableVo.ftlDescription}信息", notes = "列表查询${tableVo.ftlDescription}信息", httpMethod="GET") @GetMapping(value = "/list") - public Result> queryList(@ApiIgnore @RequestParam HashMap paramMap) { - return Result.success(${entityName?uncap_first}Service.queryList(paramMap)); + public Result> queryList(@ApiIgnore @RequestParam HashMap param) { + return Result.success(${entityName?uncap_first}Service.queryList(param)); } /** diff --git a/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai b/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai index 7c7767647..0dc2f9760 100644 --- a/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai +++ b/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai @@ -14,9 +14,9 @@ import java.util.List; */ public interface I${entityName}Service extends IService<${entityName}> { - IPage<${entityName}> queryPageList(HashMap paramMap); + IPage<${entityName}> queryPageList(HashMap param); - List<${entityName}> queryList(HashMap paramMap); + List<${entityName}> queryList(HashMap param); void add(${entityName} ${entityName?uncap_first}); diff --git a/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai b/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai index ca5edd101..6ad537700 100644 --- a/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai +++ b/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai @@ -29,23 +29,23 @@ public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, $ @Autowired private ${entityName}Mapper ${entityName?uncap_first}Mapper; @Override - public IPage<${entityName}> queryPageList(HashMap paramMap) { - QueryWrapper<${entityName}> queryWrapper = getQueryWrapper(paramMap); - Page<${entityName}> page = PageUtil.getPage(paramMap); + public IPage<${entityName}> queryPageList(HashMap param) { + QueryWrapper<${entityName}> queryWrapper = getQueryWrapper(param); + Page<${entityName}> page = PageUtil.getPage(param); IPage<${entityName}> pageList = this.page(page, queryWrapper); pageList.setRecords(dealList(pageList.getRecords())); return pageList; } @Override - public List<${entityName}> queryList(HashMap paramMap) { - QueryWrapper<${entityName}> queryWrapper = getQueryWrapper(paramMap); + public List<${entityName}> queryList(HashMap param) { + QueryWrapper<${entityName}> queryWrapper = getQueryWrapper(param); return dealList(this.list(queryWrapper)); } - private QueryWrapper<${entityName}> getQueryWrapper(HashMap paramMap) { + private QueryWrapper<${entityName}> getQueryWrapper(HashMap param) { String alias = ""; - QueryWrapper<${entityName}> queryWrapper = QueryGenerator.initPageQueryWrapper(${entityName}.class, paramMap, alias); + QueryWrapper<${entityName}> queryWrapper = QueryGenerator.initPageQueryWrapper(${entityName}.class, param, alias); queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(${entityName}::getId)); return queryWrapper; }