update

设备类型负荷率报表-已派工时间修改

common/src/main/resources/mapper/ReportDataMapper.xml

@@ -215,15 +215,15 @@
         </if>)
         <if test="reportType != null and reportType.contains('true')">
             SELECT TD.RESOURCE_TYPE ,TD.RESOURCE_TYPE_DESCRIPTION ,TD.WORK_CENTER, TD.WORK_CENTER_DESCRIPTION,
-                   SUM(TD.PLAN_HOUR)  PLAN_HOUR, SUM(TD.CAPACITY_MAN_HOUR)  CAPACITY_MAN_HOUR,
+                   TD.PLAN_HOUR  PLAN_HOUR, SUM(TD.CAPACITY_MAN_HOUR)  CAPACITY_MAN_HOUR,
                    CASE WHEN SUM(TD.CAPACITY_MAN_HOUR) = 0 THEN 0 || '%'
-                   ELSE ROUND(SUM(TD.PLAN_HOUR)/SUM(TD.CAPACITY_MAN_HOUR),4)*100 || '%' END RATE_DATA
+                   ELSE ROUND(TD.PLAN_HOUR/SUM(TD.CAPACITY_MAN_HOUR),4)*100 || '%' END RATE_DATA
             FROM (
         </if>
         SELECT M.*,M.RATE_DATA_INT || '%' RATE_DATA FROM (
         SELECT T.SITE,T.RESOURCE_TYPE, T.RESOURCE_TYPE_DESCRIPTION, T.WORK_CENTER, T.WORK_CENTER_DESCRIPTION,T.DATE_TIME,
-                SUM(T.PLAN_HOUR)  PLAN_HOUR, SUM(T.CAPACITY_MAN_HOUR) CAPACITY_MAN_HOUR,
+                T.PLAN_HOUR  PLAN_HOUR, SUM(T.CAPACITY_MAN_HOUR) CAPACITY_MAN_HOUR,
-               CASE WHEN SUM(T.PLAN_HOUR) = 0 OR SUM(T.CAPACITY_MAN_HOUR) = 0 THEN 0 ELSE ROUND(SUM(T.PLAN_HOUR)/SUM(T.CAPACITY_MAN_HOUR),4)*100 END RATE_DATA_INT
+               CASE WHEN T.PLAN_HOUR = 0 OR SUM(T.CAPACITY_MAN_HOUR) = 0 THEN 0 ELSE ROUND(T.PLAN_HOUR/SUM(T.CAPACITY_MAN_HOUR),4)*100 END RATE_DATA_INT
             FROM
         (
         SELECT RDT.* , SUM( (DECODE(A.CNT,NULL,0,A.CNT) + DECODE(B.CNT,NULL,0,B.CNT) + DECODE(C.CNT,NULL,0,C.CNT) + DECODE(D.CNT,NULL,0,D.CNT)
@@ -281,7 +281,7 @@
         GROUP BY RESRCE , DATE_TIME ) L ON L.DATE_TIME = RDT.DATE_TIME  AND L.RESRCE = RDT.RESRCE
         GROUP BY RDT.SITE,RDT.RESRCE, RDT.RESOURCE_DESCRIPTION, RDT.DATE_TIME ,RDT.CAPACITY_MAN_HOUR , RDT.WORK_CENTER ,RDT.WORK_CENTER_DESCRIPTION ,RDT.RESOURCE_TYPE ,RDT.RESOURCE_TYPE_DESCRIPTION
         ) T
-        GROUP BY T.RESOURCE_TYPE, T.RESOURCE_TYPE_DESCRIPTION, T.WORK_CENTER, T.WORK_CENTER_DESCRIPTION,T.SITE,T.DATE_TIME ) M
+        GROUP BY T.RESOURCE_TYPE, T.RESOURCE_TYPE_DESCRIPTION, T.WORK_CENTER, T.WORK_CENTER_DESCRIPTION,T.SITE,T.DATE_TIME,T.PLAN_HOUR ) M
         WHERE M.SITE = #{site}
         <if test="startRate != null and startRate != ''">
             AND M.RATE_DATA_INT &gt;= #{startRate}
@@ -292,7 +292,7 @@
         ORDER BY M.WORK_CENTER_DESCRIPTION,M.RESOURCE_TYPE_DESCRIPTION,M.DATE_TIME
         <if test="reportType != null and reportType.contains('true')">
             ) TD
-            GROUP BY TD.RESOURCE_TYPE ,TD.RESOURCE_TYPE_DESCRIPTION ,TD.WORK_CENTER, TD.WORK_CENTER_DESCRIPTION
+            GROUP BY TD.RESOURCE_TYPE ,TD.RESOURCE_TYPE_DESCRIPTION ,TD.WORK_CENTER, TD.WORK_CENTER_DESCRIPTION,TD.PLAN_HOUR
             ORDER BY TD.WORK_CENTER_DESCRIPTION ,TD.RESOURCE_TYPE_DESCRIPTION
         </if>
     </select>