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 f368683e..aa113483 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 @@ -177,16 +177,20 @@ public class IndexService { } public List overallDepartmentStatistics() { - String year = String.valueOf(DateUtil.year(new DateTime())); - DepartStatisticsSearch departStatisticsSearch = new DepartStatisticsSearch(); - departStatisticsSearch.setYear(year); - departStatisticsSearch.setColumn("allMoney"); - departStatisticsSearch.setOrder("desc"); - Page page = new Page<>(-1, -1); - IPage pageList = payWorkingGroupService.queryPageListDepartment(page, departStatisticsSearch, new ArrayList<>()); - List records = pageList.getRecords(); - return convertDepartStatistics(records); + String year = String.valueOf(DateUtil.year(new DateTime())); + List records = payWorkingGroupMapper.overallDepartmentStatistics(year); + List all = payWorkingGroupMapper.allDepartmentStatistics(year); + for (DepartStatistics a : all) { + String departName = a.getDepartName(); + for (DepartStatistics record : records) { + String departName1 = record.getDepartName(); + if (departName.equals(departName1)){ + a.setConfirmAmount(record.getConfirmAmount()); + } + } + } + return convertDepartStatistics(all); } private List convertDepartStatistics(List list){ 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 217e5b9b..b1ecf788 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 @@ -251,4 +251,7 @@ public interface PayWorkingGroupMapper extends BaseMapper { BigDecimal invoiceAmount(@Param("start") Integer start, @Param("end") Integer end, @Param("departCode") String departCode); + List overallDepartmentStatistics(@Param("year") String year); + + List allDepartmentStatistics(@Param("year") String year); } 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 0b5669d6..6018285f 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 @@ -2736,5 +2736,25 @@ ) a + +