diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java index 47cf1993..7660023a 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java @@ -498,6 +498,20 @@ public class ReportController { } } + /** + * 项目齐套率报表 + * @param + * @return + */ + @GetMapping("/projectAlignmentRateReport") + public R projectAlignmentRateReport(@RequestParam(required = false) Map paramMap){ + try { + return R.ok(reportService.projectAlignmentRateReport(paramMap)); + } catch (Exception e) { + return R.failed(e.getMessage()); + } + } + /** * * 客户维度已完工工时报表 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 3c041b8c..e0b16bc7 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,4 +255,10 @@ public interface ReportMapper { Map getCapacityLoadUNPlanHours(); + /** + * 项目齐套率报表 + * @param paramMap + * @return + */ + List> projectAlignmentRateReport(Map paramMap); } diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java index ef2401e2..23c0ee92 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java @@ -264,4 +264,12 @@ public interface ReportService { * @return */ Map workHoursBoard(String user); + + /** + * 项目齐套率报表 + * @param paramMap + * @return + */ + List> projectAlignmentRateReport(Map paramMap); + } 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 1d1a31de..d48dee68 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 @@ -1471,6 +1471,19 @@ public class ReportServiceImpl implements ReportService { return result; } + /** + * 项目齐套率报表 + * @param paramMap + * @return + */ + @Override + public List> projectAlignmentRateReport(Map paramMap) { + String site = CommonMethods.getSite(); + paramMap.put("site", site); + paramMap.put("locale", LocaleContextHolder.getLocale().getLanguage()); + return reportMapper.projectAlignmentRateReport(paramMap); + } + /** * 工时统计报表 * @param paramMap diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml index 7f4d94ab..65afc2cb 100644 --- a/anomaly/src/main/resources/mapper/ReportMapper.xml +++ b/anomaly/src/main/resources/mapper/ReportMapper.xml @@ -2777,5 +2777,26 @@ SELECT zab.CREATED_DATE_TIME, ELSE 0 END)) "tardinessWork" FROM Z_SFC_DISPATCH ZSD + \ No newline at end of file