Amkor/Groupware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

임현대수석님 건의사항 적용.

Browse Source
This commit is contained in:
chi
2021-05-31 13:37:27 +09:00
parent ba02049737
commit 6590694e8b
15 changed files with 463 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
JobReportMailService/Properties/AssemblyInfo.cs
View File

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를
// 기본값으로 할 수 있습니다.
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("21.05.28.1120")]
[assembly: AssemblyFileVersion("21.05.28.1120")]
[assembly: AssemblyVersion("21.05.31.0930")]
[assembly: AssemblyFileVersion("21.05.31.0930")]

2
JobReportMailService/fJobReportWeek.cs
View File

@@ -154,7 +154,7 @@ namespace JobReportMailService
//이 날짜가 휴일인지 체크한다.
db = new EEEntities();
var Holyinfo = db.HolidayLIst.Where(t => t.pdate == jobdata.package).FirstOrDefault();
var Holyinfo = db.HolidayLIst.Where(t => t.pdate == jobdata.pdate).FirstOrDefault();
if (Holyinfo != null && Holyinfo.free != null && (bool)(Holyinfo.free)) continue;
//이날짜에는 8시간을 근무 해야 한다