From 160222889a8e01e8f35dacf045f1eee9c8950748 Mon Sep 17 00:00:00 2001 From: chi Date: Thu, 13 May 2021 10:18:10 +0900 Subject: [PATCH] =?UTF-8?q?k5=EB=A6=AC=ED=8F=AC=ED=8A=B8=20=EC=9B=90?= =?UTF-8?q?=EB=9E=98=20=EC=88=98=EC=8B=9D=EB=8C=80=EB=A1=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SubProject/FPJ0000/JobReport_/rK5Dailyform.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SubProject/FPJ0000/JobReport_/rK5Dailyform.cs b/SubProject/FPJ0000/JobReport_/rK5Dailyform.cs index b2fcf09..a370a6e 100644 --- a/SubProject/FPJ0000/JobReport_/rK5Dailyform.cs +++ b/SubProject/FPJ0000/JobReport_/rK5Dailyform.cs @@ -98,7 +98,7 @@ namespace FPJ0000.JobReport_ newdr2.Sign = string.Empty; newdr2.ww = item.Key.Substring(2, 2) + "-" + int.Parse(drDate.ww).ToString("00"); newdr2.pdate = int.Parse(item.Key.Substring(8, 2)).ToString("00"); - newdr2.value = item.Where(t => t.svalue == "Technical Support" && t.status != "진행 완료").Count(); + newdr2.value = item.Where(t => t.svalue == "Technical Support" && (t.status == "진행 중" || t.status.EndsWith("%"))).Count(); newdr2.graph = true; dsReport.K5DailyForm.AddK5DailyFormRow(newdr2); @@ -182,7 +182,7 @@ namespace FPJ0000.JobReport_ newdr8.Sign = string.Empty; newdr8.ww = item.Key.Substring(2, 2) + "-" + int.Parse(drDate.ww).ToString("00"); newdr8.pdate = int.Parse(item.Key.Substring(8, 2)).ToString("00"); - newdr8.value = (double)(item.Where(t => t.svalue != "Overhaul" && t.svalue != "Project" && t.svalue != "Training").Sum(t => t.hrs)); + newdr8.value = (double)(item.Where(t => (t.svalue == "Others" || t.svalue == "others")).Sum(t => t.hrs)); newdr8.graph = false; dsReport.K5DailyForm.AddK5DailyFormRow(newdr8);