diff --git a/Models/external_employee/external_employeeService.cs b/Models/external_employee/external_employeeService.cs index 421642a..555c622 100644 --- a/Models/external_employee/external_employeeService.cs +++ b/Models/external_employee/external_employeeService.cs @@ -342,49 +342,49 @@ select {0}b{0}.{0}employee_id{0}, ( if (dr["sum_day_sick_leave"] != DBNull.Value) { - i.sum_day_sick_leave = Convert.ToInt32(dr["sum_day_sick_leave"]); + i.sum_day_sick_leave = Convert.ToDecimal(dr["sum_day_sick_leave"]); } if (dr["count_sick_leave"] != DBNull.Value) { - i.count_sick_leave = Convert.ToInt32(dr["count_sick_leave"]); + i.count_sick_leave = Convert.ToDecimal(dr["count_sick_leave"]); } if (dr["sum_day_personal_leave"] != DBNull.Value) { - i.sum_day_personal_leave = Convert.ToInt32(dr["sum_day_personal_leave"]); + i.sum_day_personal_leave = Convert.ToDecimal(dr["sum_day_personal_leave"]); } if (dr["count_personal_leave"] != DBNull.Value) { - i.count_personal_leave = Convert.ToInt32(dr["count_personal_leave"]); + i.count_personal_leave = Convert.ToDecimal(dr["count_personal_leave"]); } if (dr["sum_day_vacation_leave"] != DBNull.Value) { - i.sum_day_vacation_leave = Convert.ToInt32(dr["sum_day_vacation_leave"]); + i.sum_day_vacation_leave = Convert.ToDecimal(dr["sum_day_vacation_leave"]); } if (dr["count_vacation_leave"] != DBNull.Value) { - i.count_vacation_leave = Convert.ToInt32(dr["count_vacation_leave"]); + i.count_vacation_leave = Convert.ToDecimal(dr["count_vacation_leave"]); } if (dr["count_stop_working"] != DBNull.Value) { - i.count_stop_working = Convert.ToInt32(dr["count_stop_working"]); + i.count_stop_working = Convert.ToDecimal(dr["count_stop_working"]); } if (dr["count_late_tad_processing_time_results"] != DBNull.Value) { - i.count_late_tad_processing_time_results = Convert.ToInt32(dr["count_late_tad_processing_time_results"]); + i.count_late_tad_processing_time_results = Convert.ToDecimal(dr["count_late_tad_processing_time_results"]); } if (dr["count_absence_tad_processing_time_results"] != DBNull.Value) { - i.count_absence_tad_processing_time_results = Convert.ToInt32(dr["count_absence_tad_processing_time_results"]); + i.count_absence_tad_processing_time_results = Convert.ToDecimal(dr["count_absence_tad_processing_time_results"]); } if (dr["sum_day_sick_personal_leave"] != DBNull.Value) { - i.sum_day_sick_personal_leave = Convert.ToInt32(dr["sum_day_sick_personal_leave"]); + i.sum_day_sick_personal_leave = Convert.ToDecimal(dr["sum_day_sick_personal_leave"]); } if (dr["count_sick_personal_leave"] != DBNull.Value) { - i.count_sick_personal_leave = Convert.ToInt32(dr["count_sick_personal_leave"]); + i.count_sick_personal_leave = Convert.ToDecimal(dr["count_sick_personal_leave"]); } - + return i; } diff --git a/Models/external_employee/external_employeeViewModel.cs b/Models/external_employee/external_employeeViewModel.cs index 4531e91..144589f 100644 --- a/Models/external_employee/external_employeeViewModel.cs +++ b/Models/external_employee/external_employeeViewModel.cs @@ -13,17 +13,17 @@ namespace TodoAPI2.Models { public class employee_leaveViewModel { - public int? sum_day_sick_leave { get; set; } - public int? count_sick_leave { get; set; } - public int? sum_day_personal_leave { get; set; } - public int? count_personal_leave { get; set; } - public int? sum_day_vacation_leave { get; set; } - public int? count_vacation_leave { get; set; } - public int? count_stop_working { get; set; } - public int? count_late_tad_processing_time_results { get; set; } - public int? count_absence_tad_processing_time_results { get; set; } - public int? sum_day_sick_personal_leave { get; set; } - public int? count_sick_personal_leave { get; set; } + public decimal? sum_day_sick_leave { get; set; } + public decimal? count_sick_leave { get; set; } + public decimal? sum_day_personal_leave { get; set; } + public decimal? count_personal_leave { get; set; } + public decimal? sum_day_vacation_leave { get; set; } + public decimal? count_vacation_leave { get; set; } + public decimal? count_stop_working { get; set; } + public decimal? count_late_tad_processing_time_results { get; set; } + public decimal? count_absence_tad_processing_time_results { get; set; } + public decimal? sum_day_sick_personal_leave { get; set; } + public decimal? count_sick_personal_leave { get; set; } } public class external_employeeViewModel {