零件加工报表，工作令加工进度表

anomaly/src/main/resources/mapper/ReportMapper.xml

@@ -96,8 +96,8 @@
             FINISHED_STATUS,
             zsd.SITE,
             CASE
-                WHEN zsdTemplate.NUM > 1 THEN '未完成'
-                ELSE '完成'
+                WHEN zsdTemplate.NUM > 1 THEN '否'
+                ELSE '是'
             END HJ_IS_COMPLETE,
             cf2.VALUE ITEM_NUMBER,
             so.SHOP_ORDER ,
@@ -112,8 +112,8 @@
             o3.OPERATION CURRENT_OPERATION,
             ot3.DESCRIPTION CURRENT_OPERATION_DESCRIPTION,
             CASE
-                WHEN zsd3.NUM > 1 THEN '未完成'
-                ELSE '完成'
+                WHEN zsd3.NUM > 1 THEN '否'
+                ELSE '是'
             END IS_COMPLETE,
             zsd2.EMPLOYEE_DESCRIPTION,
             zsd2.PLANNED_START_DATE ,
@@ -271,9 +271,9 @@
                 OR OPERATION_DESCRIPTION LIKE '%${operation}%'
             )
         </if>
-        <if test="finishedStatus != null and finishedStatus != ''">
-            AND FINISHED_STATUS = #{finishedStatus}
-        </if>
+<!--        <if test="finishedStatus != null and finishedStatus != ''">-->
+<!--            AND FINISHED_STATUS = #{finishedStatus}-->
+<!--        </if>-->
         <if test="startDateTime != null and startDateTime != ''">
                 AND ACTUAL_START_DATE &gt;= TO_DATE(#{startDateTime}, 'YYYY-MM-DD') - 8/24
         </if>
@@ -803,6 +803,7 @@
                     TO_CHAR(TO_NUMBER(zsd.OPERATION_PERCENT), 'FM9999990.00') || '%' OPERATION_PERCENT,
                     CREATED_DATE_TIME,
                     zsd.WORK_CENTER,
+                    zsd.SUM_HOURS,
                     CASE WHEN zsd2.QTY > 0 THEN '未完成' ELSE '完成' END IS_COMPLETE
              FROM (
                       SELECT WORK_ORDER,
@@ -810,6 +811,7 @@
                              MIN(CREATED_DATE_TIME) CREATED_DATE_TIME,
                              SUM(DISPATCH_QTY)      DISPATCH_QTY,
                              WORK_CENTER,
+                             SUM(COMP_HOURS) SUM_HOURS,
                              CASE
                                  WHEN SUM(COMP_HOURS) != 0 THEN (SUM(COMP_HOURS) / SUM(HOURS) * 100)
                                  ELSE 0 END         HOURS_PERCENT,