From dddeb8fbed854dc9ffdd84841fba5b21899f3eae Mon Sep 17 00:00:00 2001 From: chapal Date: Thu, 24 Apr 2025 17:04:36 +0600 Subject: [PATCH] Attn process and benifit process --- .../Service/Attendance/AttendanceProcess.cs | 8 ++++-- .../OverTime/EmployeeOverTimeService.cs | 26 +++++++++---------- .../EmployeeUnAuthorizeLeaveService.cs | 16 ++++++------ 3 files changed, 27 insertions(+), 23 deletions(-) diff --git a/HRM.DA/Service/Attendance/AttendanceProcess.cs b/HRM.DA/Service/Attendance/AttendanceProcess.cs index 16f57b4..af4b782 100644 --- a/HRM.DA/Service/Attendance/AttendanceProcess.cs +++ b/HRM.DA/Service/Attendance/AttendanceProcess.cs @@ -117,8 +117,11 @@ namespace HRM.DA { DateTime oLastDate = attnProcess.AttnDate.LastDateOfMonth(); DateTime oFirstDate = attnProcess.AttnDate.FirstDateOfMonth(); + //_AttNHolidays = + // new AttnNationalHolidayService().GetByMonthAndPayrollType(oFirstDate, oLastDate, payrollTypeID); _AttNHolidays = - new AttnNationalHolidayService().GetByMonthAndPayrollType(oFirstDate, oLastDate, payrollTypeID); + new AttnNationalHolidayService().Get(EnumStatus.Active, payrollTypeID); + } AttnNationalHoliday oAttNHoliday = _AttNHolidays.Where(o => @@ -2452,7 +2455,8 @@ namespace HRM.DA foreach (DataRow Dr in EmpOTHours.Tables[0].Rows) { Employee tempEmployee = employees.Where(emp => emp.ID.ToString() == Dr["EmployeeID"].ToString()).FirstOrDefault(); - if (tempEmployee == null) continue; + if (tempEmployee == null || tempEmployee.IsEligibleOT == false) continue; + if (tempEmployee.GradeID == null) { ErrorList.Add(new SalaryProcessStatus(tempEmployee.EmployeeNo, tempEmployee.Name, "Grade not assinged")); diff --git a/HRM.DA/Service/OverTime/EmployeeOverTimeService.cs b/HRM.DA/Service/OverTime/EmployeeOverTimeService.cs index 79095c1..4f614ed 100644 --- a/HRM.DA/Service/OverTime/EmployeeOverTimeService.cs +++ b/HRM.DA/Service/OverTime/EmployeeOverTimeService.cs @@ -340,19 +340,19 @@ namespace HRM.DA using (SqlBulkCopy bulkCopy = new SqlBulkCopy((SqlConnection)tc.Connection, SqlBulkCopyOptions.Default, (SqlTransaction)tc.Transaction)) { bulkCopy.BulkCopyTimeout = 6000; // in seconds - bulkCopy.ColumnMappings.Add("EMPLOYEEID", "EMPLOYEEID"); - bulkCopy.ColumnMappings.Add("MONTHDATE", "MONTHDATE"); - bulkCopy.ColumnMappings.Add("TERMID", "TERMID"); - bulkCopy.ColumnMappings.Add("TERMPARAMETERID", "TERMPARAMETERID"); - bulkCopy.ColumnMappings.Add("OTHOURS", "OTHOURS"); - bulkCopy.ColumnMappings.Add("AMOUNT", "AMOUNT"); - bulkCopy.ColumnMappings.Add("CREATEDBY", "CREATEDBY"); - bulkCopy.ColumnMappings.Add("CREATIONDATE", "CREATIONDATE"); - bulkCopy.ColumnMappings.Add("MODIFIEDBY", "MODIFIEDBY"); - bulkCopy.ColumnMappings.Add("MODIFIEDDATE", "MODIFIEDDATE"); - bulkCopy.ColumnMappings.Add("OTMONTH", "OTMONTH"); - bulkCopy.ColumnMappings.Add("EMPOVERTIMEID", "EMPOVERTIMEID"); - bulkCopy.ColumnMappings.Add("PAYROLLTYPEID", "PAYROLLTYPEID"); + bulkCopy.ColumnMappings.Add("EMPLOYEEID", "EmployeeID"); + bulkCopy.ColumnMappings.Add("MONTHDATE", "MonthDate"); + bulkCopy.ColumnMappings.Add("TERMID", "TermID"); + bulkCopy.ColumnMappings.Add("TERMPARAMETERID", "TermParameterID"); + bulkCopy.ColumnMappings.Add("OTHOURS", "OTHours"); + bulkCopy.ColumnMappings.Add("AMOUNT", "Amount"); + bulkCopy.ColumnMappings.Add("CREATEDBY", "CreatedBy"); + bulkCopy.ColumnMappings.Add("CREATIONDATE", "CreationDate"); + bulkCopy.ColumnMappings.Add("MODIFIEDBY", "ModifiedBy"); + bulkCopy.ColumnMappings.Add("MODIFIEDDATE", "ModifiedDate"); + bulkCopy.ColumnMappings.Add("OTMONTH", "OTMonth"); + bulkCopy.ColumnMappings.Add("EMPOVERTIMEID", "EmpOverTimeID"); + bulkCopy.ColumnMappings.Add("PAYROLLTYPEID", "PayrollTypeID"); bulkCopy.ColumnMappings.Add("PRVMONTHHOURS", "PRVMONTHHOURS"); bulkCopy.ColumnMappings.Add("CURRMONTHHOURS", "CURRMONTHHOURS"); diff --git a/HRM.DA/Service/UnAuthLeave/EmployeeUnAuthorizeLeaveService.cs b/HRM.DA/Service/UnAuthLeave/EmployeeUnAuthorizeLeaveService.cs index bd21011..a304179 100644 --- a/HRM.DA/Service/UnAuthLeave/EmployeeUnAuthorizeLeaveService.cs +++ b/HRM.DA/Service/UnAuthLeave/EmployeeUnAuthorizeLeaveService.cs @@ -759,21 +759,21 @@ namespace HRM.DA using (SqlBulkCopy bulkCopy = new SqlBulkCopy((SqlConnection)tc.Connection, SqlBulkCopyOptions.Default, (SqlTransaction)tc.Transaction)) { bulkCopy.BulkCopyTimeout = 6000; // in seconds - bulkCopy.ColumnMappings.Add("EMPLEAVEID", "EMPLEAVEID"); + bulkCopy.ColumnMappings.Add("EMPLEAVEID", "EmpLeaveID"); bulkCopy.ColumnMappings.Add("EMPLOYEEID", "EMPLOYEEID"); bulkCopy.ColumnMappings.Add("LEAVEID", "LEAVEID"); bulkCopy.ColumnMappings.Add("MONTHDATE", "MONTHDATE"); bulkCopy.ColumnMappings.Add("LEAVEDAY", "LEAVEDAY"); - bulkCopy.ColumnMappings.Add("CREATEDBY", "CREATEDBY"); + bulkCopy.ColumnMappings.Add("CREATEDBY", "CreatedBy"); bulkCopy.ColumnMappings.Add("LEAVEMONTH", "LEAVEMONTH"); bulkCopy.ColumnMappings.Add("FROMDATE", "FROMDATE"); bulkCopy.ColumnMappings.Add("TODATE", "TODATE"); - bulkCopy.ColumnMappings.Add("CREATIONDATE", "CREATIONDATE"); - bulkCopy.ColumnMappings.Add("MODIFIEDBY", "MODIFIEDBY"); - bulkCopy.ColumnMappings.Add("MODIFIEDDATE", "MODIFIEDDATE"); - bulkCopy.ColumnMappings.Add("TYPE", "TYPE"); - bulkCopy.ColumnMappings.Add("REFERENCEID", "REFERENCEID"); - bulkCopy.ColumnMappings.Add("PARAMID", "PARAMID"); + bulkCopy.ColumnMappings.Add("CREATIONDATE", "CreationDate"); + bulkCopy.ColumnMappings.Add("MODIFIEDBY", "ModifiedBy"); + bulkCopy.ColumnMappings.Add("MODIFIEDDATE", "ModifiedDate"); + bulkCopy.ColumnMappings.Add("TYPE", "Type"); + bulkCopy.ColumnMappings.Add("REFERENCEID", "ReferenceID"); + bulkCopy.ColumnMappings.Add("PARAMID", "ParamID"); bulkCopy.ColumnMappings.Add("ISLATEATTENDANCERELATED", "ISLATEATTENDANCERELATED"); bulkCopy.ColumnMappings.Add("PAYROLLTYPEID", "PAYROLLTYPEID");