diff --git a/src/main/java/cn/chjyj/szwh/controller/admin/AdminAccountCloseController.java b/src/main/java/cn/chjyj/szwh/controller/admin/AdminAccountCloseController.java index 4532de9..dd22f49 100644 --- a/src/main/java/cn/chjyj/szwh/controller/admin/AdminAccountCloseController.java +++ b/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); diff --git a/src/main/java/cn/chjyj/szwh/mapper/OrderUserMapper.java b/src/main/java/cn/chjyj/szwh/mapper/OrderUserMapper.java index fff6f2c..2806a72 100644 --- a/src/main/java/cn/chjyj/szwh/mapper/OrderUserMapper.java +++ b/src/main/java/cn/chjyj/szwh/mapper/OrderUserMapper.java @@ -34,5 +34,12 @@ public interface OrderUserMapper { * 订单结算 * @return */ - List ordercs(@Param("map") Map map); + List ordercs(@Param("map") Map map,@Param("start") int start,@Param("limit") Integer limit); + + /** + * 统计结算结果数量 + * @param map + * @return + */ + int countOrderCs(@Param("map") Map map); } diff --git a/src/main/java/cn/chjyj/szwh/service/impl/AccountCloseServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/AccountCloseServiceImpl.java index d2eae06..948dee1 100644 --- a/src/main/java/cn/chjyj/szwh/service/impl/AccountCloseServiceImpl.java +++ b/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 xlist = orderUserMapper.ordercs(qmap); + List xlist = orderUserMapper.ordercs(qmap,start,limit); + int total = orderUserMapper.countOrderCs(qmap); + retmap.put("total",total); retmap.put("data",xlist); return retmap; } diff --git a/src/main/resources/mapper/szwh/OrderUserMapper.xml b/src/main/resources/mapper/szwh/OrderUserMapper.xml index 9bf6d8c..c3c94fd 100644 --- a/src/main/resources/mapper/szwh/OrderUserMapper.xml +++ b/src/main/resources/mapper/szwh/OrderUserMapper.xml @@ -29,29 +29,56 @@ + + + diff --git a/src/test/java/cn/chjyj/szwh/mapper/OrderUserMapperTest.java b/src/test/java/cn/chjyj/szwh/mapper/OrderUserMapperTest.java index 5f776a4..183365c 100644 --- a/src/test/java/cn/chjyj/szwh/mapper/OrderUserMapperTest.java +++ b/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 xxlist = orderUserMapper.ordercs(query); + List xxlist = orderUserMapper.ordercs(query,0,10); for(SettleVo sl:xxlist){ System.out.println(sl.getBankName()); }