diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java index 338d672d..3c041b8c 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java @@ -253,4 +253,6 @@ public interface ReportMapper { List> customerDimensionFinishedTimeReportNotWorkCenter(Map paramMap); + Map getCapacityLoadUNPlanHours(); + } diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java index 119dca8e..aa2dbf97 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java @@ -1097,7 +1097,10 @@ public class ReportServiceImpl implements ReportService { planUndoneHoursList.add(Float.valueOf(String.valueOf(map.get("planUndoneHours")))); eightList.add(resourceMap); } - result.put("planCapacity",Math.round(planCapacity)); +// result.put("planCapacity",Math.round(planCapacity)); + Map capacityLoadUNPlanHours = reportMapper.getCapacityLoadUNPlanHours(); + result.put("planCapacity",capacityLoadUNPlanHours.get("tardinessWork")); + result.put("standardCapacity",Math.round(standardCapacity)); //八个柱状图 result.put("eightList",eightList); diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml index b8a69ba6..87e675c0 100644 --- a/anomaly/src/main/resources/mapper/ReportMapper.xml +++ b/anomaly/src/main/resources/mapper/ReportMapper.xml @@ -2810,5 +2810,14 @@ SELECT zab.CREATED_DATE_TIME, + \ No newline at end of file