From 218a1de9547dcba541e67351c96d1585aebdfc34 Mon Sep 17 00:00:00 2001 From: chi Date: Wed, 6 Oct 2021 17:55:31 +0900 Subject: [PATCH] =?UTF-8?q?=EC=97=85=EB=AC=B4=EC=9D=BC=EC=A7=80=20?= =?UTF-8?q?=EC=9B=94=EB=B3=84=20=EC=A7=91=EA=B3=84=ED=91=9C=EC=97=90=20?= =?UTF-8?q?=ED=9C=B4=EC=9D=BC=20ot=20=EA=B0=80=20=ED=8F=AC=ED=95=A8?= =?UTF-8?q?=EB=90=98=EC=A7=80=20=EC=95=8A=EC=9D=80=20=ED=91=9C=EC=8B=9C=20?= =?UTF-8?q?=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Project/Properties/AssemblyInfo.cs | 4 ++-- SubProject/FPJ0000/JobReport_/rJobReport.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index c13f190..cd6f6ee 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("21.10.06.1640")] -[assembly: AssemblyFileVersion("21.10.06.1640")] +[assembly: AssemblyVersion("21.10.06.1750")] +[assembly: AssemblyFileVersion("21.10.06.1750")] diff --git a/SubProject/FPJ0000/JobReport_/rJobReport.cs b/SubProject/FPJ0000/JobReport_/rJobReport.cs index dd98665..52e428c 100644 --- a/SubProject/FPJ0000/JobReport_/rJobReport.cs +++ b/SubProject/FPJ0000/JobReport_/rJobReport.cs @@ -109,7 +109,7 @@ namespace FPJ0000.JobReport_ var sumhr = userDatas.Sum(t => t.hrs); var sumot = userDatas.Sum(t => t.ot); var sumhl = userDatas.Sum(t => t.holyot); - if (sumot == 0) rowdata.Add(string.Format("{0}", sumhr, sumot)); + if (sumot + sumhl == 0) rowdata.Add(string.Format("{0}", sumhr, sumot)); else rowdata.Add(string.Format("{0}+{1}(*{2})", sumhr, sumot,sumhl));