KH/kh-device-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【fix bug】querylist方法，添加属性

Browse Source
This commit is contained in:
梁琦涛
2023-03-14 16:29:43 +08:00
parent 73965ebe7c
commit 4d0a255015
6 changed files with 34 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
+1 -2
View File
@@ -75,8 +75,7 @@ public class ${entityName}Controller extends JeroController<${entityName}, I${en
@ApiOperation(value="${tableVo.ftlDescription}-列表查询", notes="${tableVo.ftlDescription}-列表查询") @ApiOperation(value="${tableVo.ftlDescription}-列表查询", notes="${tableVo.ftlDescription}-列表查询")
@GetMapping(value = "/list") @GetMapping(value = "/list")
public Result<List<${entityName}>> queryList(${entityName} ${entityName?uncap_first}, HttpServletRequest req) { public Result<List<${entityName}>> 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(${entityName?uncap_first}, req);
List<${entityName}> list = ${entityName?uncap_first}Service.queryList(queryWrapper);
return Result.OK(list); return Result.OK(list);
} }
jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai
+4 -3
View File
@@ -1,8 +1,8 @@
package ${bussiPackage}.${entityPackage}.service; package ${bussiPackage}.${entityPackage}.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import ${bussiPackage}.${entityPackage}.entity.${entityName}; import ${bussiPackage}.${entityPackage}.entity.${entityName};
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import javax.servlet.http.HttpServletRequest;
import java.util.List; import java.util.List;
/** /**
@@ -56,8 +56,9 @@ public interface I${entityName}Service extends IService<${entityName}> {
/** /**
* 列表查询 * 列表查询
* *
* @param queryWrapper * @param ${entityName?uncap_first}
* @param req
* @return * @return
*/ */
List<${entityName}> queryList(QueryWrapper<${entityName}> queryWrapper); List<${entityName}> queryList(${entityName} ${entityName?uncap_first}, HttpServletRequest req);
} }
jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai
+7 -4
View File
@@ -9,7 +9,9 @@ import com.jero.common.exception.JeroBootException;
import java.util.List; import java.util.List;
import java.util.Date; import java.util.Date;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jero.common.system.query.QueryGenerator;
import javax.servlet.http.HttpServletRequest;
/** /**
* @Description: ${tableVo.ftlDescription} * @Description: ${tableVo.ftlDescription}
@@ -84,11 +86,12 @@ public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, $
/** /**
* 列表查询 * 列表查询
* *
* @param queryWrapper * @param ${entityName?uncap_first}
* @param req
* @return * @return
*/ */
@Override @Override
public List<${entityName}> queryList(QueryWrapper<${entityName}> queryWrapper) { public List<${entityName}> queryList(${entityName} ${entityName?uncap_first}, HttpServletRequest req) {
return list(queryWrapper); return list(QueryGenerator.initQueryWrapper(${entityName?uncap_first}, req.getParameterMap()));
} }
} }
jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
+3 -2
View File
@@ -74,14 +74,15 @@ public class ${entityName}Controller extends JeroController<${entityName}, I${en
/** /**
* 列表查询 * 列表查询
* *
* @param ${entityName?uncap_first}
* @param req
* @return * @return
*/ */
@AutoLog(value = "${tableVo.ftlDescription}-列表查询") @AutoLog(value = "${tableVo.ftlDescription}-列表查询")
@ApiOperation(value="${tableVo.ftlDescription}-列表查询", notes="${tableVo.ftlDescription}-列表查询") @ApiOperation(value="${tableVo.ftlDescription}-列表查询", notes="${tableVo.ftlDescription}-列表查询")
@GetMapping(value = "/list") @GetMapping(value = "/list")
public Result<List<${entityName}>> queryList(${entityName} ${entityName?uncap_first}, HttpServletRequest req) { public Result<List<${entityName}>> queryList(${entityName} ${entityName?uncap_first}, HttpServletRequest req) {
QueryWrapper<${entityName}> queryWrapper = QueryGenerator.initQueryWrapper(${entityName?uncap_first}, req.getParameterMap()); List<?> list = ${entityName?uncap_first}Service.queryList(${entityName?uncap_first},req);
List<?> list = ${entityName?uncap_first}Service.queryList(queryWrapper);
return Result.OK(list); return Result.OK(list);
} }
jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai
+8 -6
View File
@@ -2,6 +2,7 @@ package ${bussiPackage}.${entityPackage}.service;
import ${bussiPackage}.${entityPackage}.entity.${entityName}; import ${bussiPackage}.${entityPackage}.entity.${entityName};
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import javax.servlet.http.HttpServletRequest;
import java.util.List; import java.util.List;
/** /**
@@ -52,10 +53,11 @@ public interface I${entityName}Service extends IService<${entityName}> {
${entityName} queryById(String id); ${entityName} queryById(String id);
/** /**
* 列表查询 * 列表查询
* *
* @param queryWrapper * @param ${entityName?uncap_first}
* @return * @param req
*/ * @return
List<${entityName}> queryList(QueryWrapper<${entityName}> queryWrapper); */
List<${entityName}> queryList(${entityName} ${entityName?uncap_first}, HttpServletRequest req);
} }
jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai
+11 -8
View File
@@ -8,6 +8,8 @@ import org.springframework.transaction.annotation.Transactional;
import com.jero.common.exception.JeroBootException; import com.jero.common.exception.JeroBootException;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.system.query.QueryGenerator;
import javax.servlet.http.HttpServletRequest;
/** /**
* @Description: ${tableVo.ftlDescription} * @Description: ${tableVo.ftlDescription}
@@ -74,13 +76,14 @@ public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, $
} }
/** /**
* 列表查询 * 列表查询
* *
* @param queryWrapper * @param ${entityName?uncap_first}
* @return * @param req
*/ * @return
@Override */
List<${entityName}> queryList(QueryWrapper<${entityName}> queryWrapper) { @Override
return list(queryWrapper); public List<${entityName}> queryList(${entityName} ${entityName?uncap_first}, HttpServletRequest req) {
return list(QueryGenerator.initQueryWrapper(${entityName?uncap_first}, req.getParameterMap()));
} }
} }