客户维度已完工工时报表分车间

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java

@@ -251,4 +251,6 @@ public interface ReportMapper {
 
     List<Map<String, String>> workHoursCompletedBusinessUnit(String workCenter);
 
+    List<Map<String, String>> customerDimensionFinishedTimeReportNotWorkCenter(Map paramMap);
+
 }

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<Map<String, String>> result = reportMapper.customerDimensionFinishedTimeReport(paramMap);
+        List<Map<String, String>> result = null;
+
+        if (paramMap.containsKey("workCenter") && !"".equals(paramMap.get("workCenter"))){
+            result = reportMapper.customerDimensionFinishedTimeReport(paramMap);
+        }else {
+            result = reportMapper.customerDimensionFinishedTimeReportNotWorkCenter(paramMap);
+        }
         HashMap<String, String> countMap = new HashMap<>();
         countMap.put("workCenterDescription","总计:");
         Float tardinessWork = 0.00f;

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
         <if test="workCenter != null and workCenter != ''">
             AND ZSD.WORK_CENTER = #{workCenter}
         </if>
@@ -2807,5 +2807,8 @@ SELECT zab.CREATED_DATE_TIME,
         GROUP BY WIP."shortHandWorkOrder"
         ORDER BY WIP."shortHandWorkOrder"
     </select>
+    <select id="customerDimensionFinishedTimeReportNotWorkCenter" resultType="java.util.Map">
+        SELECT Vie.* FROM customer_Dimension_FinishedTime_Report Vie
+    </select>
 
 </mapper>