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 12fccf92..338d672d 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 @@ -251,4 +251,6 @@ public interface ReportMapper { List> workHoursCompletedBusinessUnit(String workCenter); + List> customerDimensionFinishedTimeReportNotWorkCenter(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 617bc2d5..119dca8e 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 @@ -1360,7 +1360,13 @@ public class ReportServiceImpl implements ReportService { String site = CommonMethods.getSite(); paramMap.put("site", site); paramMap.put("locale", LocaleContextHolder.getLocale().getLanguage()); - List> result = reportMapper.customerDimensionFinishedTimeReport(paramMap); + List> result = null; + + if (paramMap.containsKey("workCenter") && !"".equals(paramMap.get("workCenter"))){ + result = reportMapper.customerDimensionFinishedTimeReport(paramMap); + }else { + result = reportMapper.customerDimensionFinishedTimeReportNotWorkCenter(paramMap); + } HashMap countMap = new HashMap<>(); countMap.put("workCenterDescription","总计:"); Float tardinessWork = 0.00f; diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml index af806e67..b8a69ba6 100644 --- a/anomaly/src/main/resources/mapper/ReportMapper.xml +++ b/anomaly/src/main/resources/mapper/ReportMapper.xml @@ -2641,7 +2641,6 @@ SELECT zab.CREATED_DATE_TIME, WHEN INSTR(WIP."workOrder", '非公路') > 0 THEN '非公路' WHEN INSTR(WIP."workOrder", '研究院') > 0 THEN '研究院' WHEN INSTR(WIP."workOrder", '粉体') > 0 THEN '粉体' - WHEN WIP."workOrder" IS NULL THEN '其他' ELSE '其他' END "shortHandWorkOrder", WIP."workHours1" + WIP."workHours2" + WIP."workHours3" + WIP."workHours4" + WIP."workHours5" + WIP."workHours6" + @@ -2750,6 +2749,7 @@ SELECT zab.CREATED_DATE_TIME, LEFT JOIN WORK_CENTER WC ON WC.WORK_CENTER = ZSD.WORK_CENTER LEFT JOIN WORK_CENTER_T WCT ON WCT.WORK_CENTER_BO = WC.HANDLE AND WCT.LOCALE = 'zh' CROSS JOIN MONTH + WHERE 1=1 AND ZSD.WORK_CENTER = #{workCenter} @@ -2807,5 +2807,8 @@ SELECT zab.CREATED_DATE_TIME, GROUP BY WIP."shortHandWorkOrder" ORDER BY WIP."shortHandWorkOrder" + \ No newline at end of file