Merge branch 'mycom' into 'master'

合并uat的分页新方法

See merge request rays/pcloud-common-parent!10

pcloud-common-core/src/main/java/com/pcloud/common/core/dao/BaseDao.java

@@ -100,13 +100,15 @@ public interface BaseDao<T> {
 
     PageBean listPage(PageParam pageParam, Map<String, Object> paramMap, String sqlId, String countSqlId);
 
-    /**
-     * 根据条件查询 listBy: <br/>
-     *
-     * @param paramMap
-     * @return 返回集合
-     */
-    List<T> listBy(Map<String, Object> paramMap);
+	<C> PageBeanNew<C> listPageNew(PageParam pageParam, Map<String, Object> paramMap, String sqlId, String countSqlId);
+
+	/**
+	 * 根据条件查询 listBy: <br/>
+	 *
+	 * @param paramMap
+	 * @return 返回集合
+	 */
+	List<T> listBy(Map<String, Object> paramMap);
 
     List<Object> listBy(Map<String, Object> paramMap, String sqlId);
 

pcloud-common-core/src/main/java/com/pcloud/common/core/dao/BaseDaoImpl.java

@@ -214,7 +214,24 @@ public abstract class BaseDaoImpl<T extends BaseEntity> implements BaseDao<T> {
         return new PageBean(pageParam.getPageNum(), pageParam.getNumPerPage(), count.intValue(), list);
     }
 
-    public PageBean listSimplePage(PageParam pageParam, Map<String, Object> paramMap, String sqlId) {
+	public <C> PageBeanNew<C> listPageNew(PageParam pageParam, Map<String, Object> paramMap, String sqlId,
+			String countSqlId) {
+
+		if (paramMap == null)
+			paramMap = new HashMap<String, Object>();
+
+		// 获取分页数据集 , 注切勿换成 sessionTemplate 对象
+		List<C> list = getSqlSession().selectList(getStatement(sqlId), paramMap,
+				new RowBounds(pageParam.getPageNum() * pageParam.getNumPerPage(), pageParam.getNumPerPage()));
+
+		// 统计总记录数
+		Object countObject = getSqlSession().selectOne(getStatement(countSqlId), paramMap);
+		Long count = Long.valueOf(countObject.toString());
+
+		return new PageBeanNew<C>(pageParam.getPageNum(), pageParam.getNumPerPage(), count.intValue(), list);
+	}
+
+	public PageBean listSimplePage(PageParam pageParam, Map<String, Object> paramMap, String sqlId) {
 
         if (paramMap == null)
             paramMap = new HashMap<String, Object>();