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));