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 3b15459f..350c3b29 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 @@ -255,7 +255,7 @@ public interface ReportMapper { List> customerDimensionFinishedTimeReportNotWorkCenter(Map paramMap); - Map getCapacityLoadUNPlanHours(); + Map getCapacityLoadUNPlanHours(@Param("workCenter") String workCenter); /** * 项目齐套率报表 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 e7d3a029..45b3f4ee 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 @@ -1084,6 +1084,7 @@ public class ReportServiceImpl implements ReportService { result.put("capacityLoadList",capacityLoadList); Float planCapacity = 0f; Float standardCapacity = 0f; + Float standardMonthCapacity = 0f; ArrayList> eightList = new ArrayList<>(); ArrayList planHoursList = new ArrayList<>(); ArrayList planUndoneHoursList = new ArrayList<>(); @@ -1112,6 +1113,7 @@ public class ReportServiceImpl implements ReportService { planCapacity += Float.parseFloat(String.valueOf(et)); } standardCapacity += Float.valueOf(String.valueOf(map.get("standardWeekCapacity"))); + standardMonthCapacity += Float.valueOf(String.valueOf(map.get("standardMonthCapacity"))); //比率 计划工时 / 标准产能 * 100 ArrayList rateList = new ArrayList<>(); rateList.add("0.00"); @@ -1129,10 +1131,11 @@ public class ReportServiceImpl implements ReportService { eightList.add(resourceMap); } // result.put("planCapacity",Math.round(planCapacity)); - Map capacityLoadUNPlanHours = reportMapper.getCapacityLoadUNPlanHours(); + Map capacityLoadUNPlanHours = reportMapper.getCapacityLoadUNPlanHours(workCenter); result.put("planCapacity",capacityLoadUNPlanHours.get("tardinessWork")); result.put("standardCapacity",Math.round(standardCapacity)); + result.put("standardMonthCapacity",Math.round(standardMonthCapacity)); //八个柱状图 result.put("eightList",eightList); //中心 计划工时、未完成工时List diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml index a8a04c69..aa7ce717 100644 --- a/anomaly/src/main/resources/mapper/ReportMapper.xml +++ b/anomaly/src/main/resources/mapper/ReportMapper.xml @@ -2808,10 +2808,16 @@ SELECT zab.CREATED_DATE_TIME, SELECT Vie.* FROM customer_Dimension_FinishedTime_Report Vie