diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/index/contoller/IndexController.java b/jero-boot-incoming-payment/src/main/java/com/jero/index/contoller/IndexController.java index f768e86b..7f3e452f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/index/contoller/IndexController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/index/contoller/IndexController.java @@ -120,11 +120,13 @@ public class IndexController { public Result uncollectedList( @RequestParam(name="type",defaultValue = "1")String type, @RequestParam(name="departCode",required = false)String departCode, + @RequestParam(name="column",required = false)String column, + @RequestParam(name="order",required = false)String order, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { Page page = new Page<>(pageNo, pageSize); - HashMap hashMap = indexService.uncollectedList(type,departCode,page); + HashMap hashMap = indexService.uncollectedList(type,departCode,page,column,order); return Result.OK(hashMap); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/index/service/IndexService.java b/jero-boot-incoming-payment/src/main/java/com/jero/index/service/IndexService.java index 9819b147..54787fec 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/index/service/IndexService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/index/service/IndexService.java @@ -359,21 +359,21 @@ public class IndexService { return uncollectedPieChartVO; } - public HashMap uncollectedList(String type, String departCode, Page page) { + public HashMap uncollectedList(String type, String departCode, Page page, String column, String order) { IPage pageList = new Page<>(); switch (type) { case "1": - pageList = payWorkingGroupMapper.invoiceAmountList(page, null, 90, departCode); + pageList = payWorkingGroupMapper.invoiceAmountList(page, null, 90, departCode,column,order); break; case "2": - pageList = payWorkingGroupMapper.invoiceAmountList(page, 91, 180, departCode); + pageList = payWorkingGroupMapper.invoiceAmountList(page, 91, 180, departCode,column,order); break; case "3": - pageList = payWorkingGroupMapper.invoiceAmountList(page, 181, 360, departCode); + pageList = payWorkingGroupMapper.invoiceAmountList(page, 181, 360, departCode,column,order); break; case "4": - pageList = payWorkingGroupMapper.invoiceAmountList(page, 361, null, departCode); + pageList = payWorkingGroupMapper.invoiceAmountList(page, 361, null, departCode,column,order); break; } if (pageList.getRecords() != null) { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java index 1ea89d56..f4761483 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java @@ -244,7 +244,7 @@ public interface PayWorkingGroupMapper extends BaseMapper { BigDecimal invoiceAmount(@Param("start") Integer start, @Param("end") Integer end, @Param("departCode") String departCode); - IPage invoiceAmountList(Page page, @Param("start") Integer start, @Param("end") Integer end, @Param("departCode") String departCode); + IPage invoiceAmountList(Page page, @Param("start") Integer start, @Param("end") Integer end, @Param("departCode") String departCode, @Param("column") String column, @Param("order") String order); AllMoney invoiceAmountList33(@Param("start") Integer start, @Param("end") Integer end, @Param("departCode") String departCode); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml index 820228c2..8fd8834d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml @@ -2413,7 +2413,8 @@