diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/bs/mapper/SupervisionStatisticsMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/bs/mapper/SupervisionStatisticsMapper.java index 1ebabc5..827526f 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/bs/mapper/SupervisionStatisticsMapper.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/bs/mapper/SupervisionStatisticsMapper.java @@ -64,4 +64,9 @@ public interface SupervisionStatisticsMapper { @SuppressWarnings("MybatisXMapperMethodInspection") List> dataTable(); + + Integer getTotalCarCount(); + + @SuppressWarnings("MybatisXMapperMethodInspection") + List> getKehuList(); } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/bs/service/SupervisionStatisticsService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/bs/service/SupervisionStatisticsService.java index b432041..dea927f 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/bs/service/SupervisionStatisticsService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/bs/service/SupervisionStatisticsService.java @@ -47,11 +47,13 @@ public class SupervisionStatisticsService { CarSummary carSummary = supervisionStatisticsMapper.getCarSummary(); Integer todayCarCount = supervisionStatisticsMapper.getTodayCarCount(); + Integer totalCarCount = supervisionStatisticsMapper.getTotalCarCount(); List regionSummary = supervisionStatisticsMapper.getRegionSummary(); List companySummary = supervisionStatisticsMapper.getCompanySummary(); List stationInfo = supervisionStatisticsMapper.getStationInfo(); List orders = supervisionStatisticsMapper.getOrders(); List projects = supervisionStatisticsMapper.getProjects(); + List> kehu = supervisionStatisticsMapper.getKehuList(); return MapUtil.builder() .put("dispatchSummary", dispatchSummary == null ? new DispatchSummary() : dispatchSummary) @@ -59,11 +61,13 @@ public class SupervisionStatisticsService { .put("disposeTotalWeight", disposeTotalWeight == null ? 0 : disposeTotalWeight) .put("carSummary", carSummary == null ? new CarSummary() : carSummary) .put("todayCarCount", todayCarCount == null ? 0 : todayCarCount) + .put("totalCarCount", totalCarCount == null ? 0 : totalCarCount) .put("regionSummary", regionSummary == null ? new ArrayList<>() : regionSummary) .put("companySummary", companySummary == null ? new ArrayList<>() : companySummary) .put("stationInfo", stationInfo == null ? new ArrayList<>() : stationInfo) .put("orders", orders == null ? new ArrayList<>() : orders) .put("projects", projects == null ? new ArrayList<>() : projects) + .put("kehu", kehu == null ? new ArrayList<>() : kehu) .build(); } diff --git a/njzscloud-svr/src/main/resources/mapper/bs/SupervisionStatisticsMapper.xml b/njzscloud-svr/src/main/resources/mapper/bs/SupervisionStatisticsMapper.xml index 4cb7ff7..b6380f2 100644 --- a/njzscloud-svr/src/main/resources/mapper/bs/SupervisionStatisticsMapper.xml +++ b/njzscloud-svr/src/main/resources/mapper/bs/SupervisionStatisticsMapper.xml @@ -52,11 +52,18 @@ + + +