From 5bd81461d2e70e882c71eaeafc1389c36b973177 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com>
Date: Wed, 3 Nov 2021 10:12:19 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=8A=A0=E5=B7=A5=E6=8A=A5?=
=?UTF-8?q?=E8=A1=A8=EF=BC=8C=E5=B7=A5=E4=BD=9C=E4=BB=A4=E5=8A=A0=E5=B7=A5?=
=?UTF-8?q?=E8=BF=9B=E5=BA=A6=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/resources/mapper/ReportMapper.xml | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml
index a9a57791..32f25aca 100644
--- a/anomaly/src/main/resources/mapper/ReportMapper.xml
+++ b/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}%'
)
-
- AND FINISHED_STATUS = #{finishedStatus}
-
+
+
+
AND ACTUAL_START_DATE >= TO_DATE(#{startDateTime}, 'YYYY-MM-DD') - 8/24
@@ -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,