【fix bug】page的方法，添加扩展service

jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai

@@ -15,7 +15,7 @@ import java.util.List;
 public interface I${entityName}Service extends IService<${entityName}> {
 
     /**
-	 * 列表查询
+	 * 分页查询
 	 *
 	 * @param ${entityName?uncap_first}
 	 * @param pageNo

jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai

@@ -15,9 +15,7 @@ import com.jero.common.util.oConvertUtils;
 import ${bussiPackage}.${entityPackage}.entity.${entityName};
 import ${bussiPackage}.${entityPackage}.service.I${entityName}Service;
 import java.util.Date;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import com.jero.common.system.base.controller.JeroController;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
@@ -65,10 +63,8 @@ public class ${entityName}Controller extends JeroController<${entityName}, I${en
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		QueryWrapper<${entityName}> queryWrapper = QueryGenerator.initQueryWrapper(${entityName?uncap_first}, req.getParameterMap());
+		IPage<${entityName}> pageList = ${entityName?uncap_first}Service.queryPage(${entityName?uncap_first}, pageNo, pageSize, req);
-		Page<${entityName}> page = new Page<>(pageNo, pageSize);
+        return Result.OK(pageList);
-		IPage<${entityName}> pageList = ${entityName?uncap_first}Service.page(page, queryWrapper);
-		return Result.OK(pageList);
 	}
 
     /**

jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai

@@ -3,6 +3,7 @@ package ${bussiPackage}.${entityPackage}.service;
 import ${bussiPackage}.${entityPackage}.entity.${entityName};
 import com.baomidou.mybatisplus.extension.service.IService;
 import javax.servlet.http.HttpServletRequest;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import java.util.List;
 
 /**
@@ -12,6 +13,26 @@ import java.util.List;
  * @Version: V1.0
  */
 public interface I${entityName}Service extends IService<${entityName}> {
+/**
+	 * 分页查询
+	 *
+	 * @param ${entityName?uncap_first}
+	 * @param pageNo
+     * @param pageSize
+	 * @param req
+	 * @return
+	 */
+    IPage<${entityName}> queryPage(${entityName} ${entityName?uncap_first}, Integer pageNo, Integer pageSize, HttpServletRequest req);
+
+	/**
+     * 列表查询
+     *
+     * @param ${entityName?uncap_first}
+     * @param req
+     * @return
+     */
+    List<${entityName}> queryList(${entityName} ${entityName?uncap_first}, HttpServletRequest req);
+
 	/**
 	 * 保存
 	 *
@@ -51,13 +72,4 @@ public interface I${entityName}Service extends IService<${entityName}> {
 	 * @return
 	 */
     ${entityName} queryById(String id);
-
-    /**
-     * 列表查询
-     *
-     * @param ${entityName?uncap_first}
-     * @param req
-     * @return
-     */
-    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

@@ -1,15 +1,19 @@
 package ${bussiPackage}.${entityPackage}.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import ${bussiPackage}.${entityPackage}.entity.${entityName};
 import ${bussiPackage}.${entityPackage}.mapper.${entityName}Mapper;
 import ${bussiPackage}.${entityPackage}.service.I${entityName}Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import com.jero.common.exception.JeroBootException;
-
+import java.util.List;
+import java.util.Date;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.system.query.QueryGenerator;
 import javax.servlet.http.HttpServletRequest;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 /**
  * @Description: ${tableVo.ftlDescription}
@@ -20,6 +24,36 @@ import javax.servlet.http.HttpServletRequest;
 @Service
 @Transactional(rollbackFor = JeroBootException.class)
 public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, ${entityName}> implements I${entityName}Service {
+
+	/**
+     * 分页查询
+     *
+     * @param ${entityName?uncap_first}
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @Override
+    public IPage<${entityName}> queryPage(${entityName} ${entityName?uncap_first}, Integer pageNo, Integer pageSize,
+                        HttpServletRequest req) {
+        QueryWrapper<${entityName}> queryWrapper = QueryGenerator.initQueryWrapper(${entityName?uncap_first}, req.getParameterMap());
+        Page<${entityName}> page = new Page<>(pageNo, pageSize);
+        return page(page, queryWrapper);
+    }
+
+    /**
+     * 列表查询
+     *
+     * @param ${entityName?uncap_first}
+     * @param req
+     * @return
+     */
+    @Override
+    public List<${entityName}> queryList(${entityName} ${entityName?uncap_first}, HttpServletRequest req) {
+        return list(QueryGenerator.initQueryWrapper(${entityName?uncap_first}, req.getParameterMap()));
+    }
+
 	/**
 	 * 保存
 	 *
@@ -74,16 +108,4 @@ public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, $
     ${entityName} queryById(String id) {
         return getById(id);
     }
-
-    /**
-     * 列表查询
-     *
-     * @param ${entityName?uncap_first}
-     * @param req
-     * @return
-     */
-    @Override
-    public List<${entityName}> queryList(${entityName} ${entityName?uncap_first}, HttpServletRequest req) {
-        return list(QueryGenerator.initQueryWrapper(${entityName?uncap_first}, req.getParameterMap()));
-    }
 }