修正分页失败

src/main/java/cn/chjyj/szwh/controller/admin/AdminAccountCloseController.java

@@ -62,11 +62,11 @@ public class AdminAccountCloseController extends BaseController {
 
         //每页大小
         String limit = request.getParameter("limit");
-        int ilimit = StringUtils.isNotBlank(limit)?20:Integer.valueOf(limit);
+        int ilimit = StringUtils.isBlank(limit)?10:Integer.valueOf(limit);
 
         // 当前页码
         String page = request.getParameter("page");
-        int ipage = StringUtils.isNotBlank(page)?1:Integer.valueOf(page);
+        int ipage = StringUtils.isBlank(page)?1:Integer.valueOf(page);
 
         //执行搜索查询
         Map rmap =accountCloseService.closeList(qmap,ilimit,ipage);

src/main/java/cn/chjyj/szwh/mapper/OrderUserMapper.java

@@ -34,5 +34,12 @@ public interface OrderUserMapper {
      * 订单结算
      * @return
      */
-    List<SettleVo> ordercs(@Param("map") Map map);
+    List<SettleVo> ordercs(@Param("map") Map map,@Param("start") int start,@Param("limit") Integer limit);
+
+    /**
+     * 统计结算结果数量
+     * @param map
+     * @return
+     */
+    int countOrderCs(@Param("map") Map map);
 }

src/main/java/cn/chjyj/szwh/service/impl/AccountCloseServiceImpl.java

@@ -90,13 +90,16 @@ public class AccountCloseServiceImpl implements AccountCloseService {
         Map retmap =new HashMap();
         int start = page>1?(page-1)*limit:0;
 
-        retmap.put("start",start);
+
+        retmap.put("start",start+1);
         retmap.put("end",page*limit);
         retmap.put("page",page);
         retmap.put("per_page",limit);
         // 按照用户isli 分组
 
-        List<SettleVo> xlist = orderUserMapper.ordercs(qmap);
+        List<SettleVo> xlist = orderUserMapper.ordercs(qmap,start,limit);
+        int total = orderUserMapper.countOrderCs(qmap);
+        retmap.put("total",total);
         retmap.put("data",xlist);
         return retmap;
     }

src/main/resources/mapper/szwh/OrderUserMapper.xml

@@ -52,6 +52,33 @@
             </if>
         </where>
         ORDER BY u.id DESC
+        Limit #{start},#{limit}
+    </select>
+
+    <!-- 统计结算数量 -->
+    <select id="countOrderCs" parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT count(*)
+        FROM order_user u
+        INNER JOIN `order` o ON u.batchcode=o.batchcode
+        <where>
+            <if test="map!=null">
+                <foreach collection="map" item="v" index="k" separator="and">
+                    <if test="v != null and v != '' and k!='u.name'">
+                        ${k} = #{v}
+                    </if>
+                    <if test="k=='u.publicAccount'">
+                        u.publicAccount like concat('%',#{v},'%')
+                    </if>
+                    <if test="k=='u.name'">
+                        u.`name` like concat('%',#{v},'%')
+                    </if>
+                </foreach>
+
+            </if>
+            <if test="map==null">
+                u.id IN (SELECT MAX(id) FROM order_user GROUP BY islicode)
+            </if>
+        </where>
     </select>
 
     <!--查询用户-->

src/test/java/cn/chjyj/szwh/mapper/OrderUserMapperTest.java

@@ -41,7 +41,7 @@ public class OrderUserMapperTest {
     public void ordcs(){
         Map query = new HashMap();
         query.put("name","测试");
-        List<SettleVo> xxlist = orderUserMapper.ordercs(query);
+        List<SettleVo> xxlist = orderUserMapper.ordercs(query,0,10);
         for(SettleVo sl:xxlist){
             System.out.println(sl.getBankName());
         }