thamming_dev01/hrm_eva
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

แก้ไข การคำนวณ

Browse Source
This commit is contained in:
LAPTOP-KB8JC2K2\acer
2021-07-09 12:32:34 +07:00
parent 15c1ec9841
commit 5f69d9c1df
4 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Models/eva_limit_frame_plan/eva_limit_frame_planEntity.cs
View File

@@ -56,12 +56,13 @@ namespace TodoAPI2.Models
public void DoAfterInsertUpdate(DataContext context)
{
//total_salary = (from i in context.eva_limit_frame_employee
// join j in context.eva_limit_frame_group
// on i.frame_group_guid equals j.id
// select i.salary).Sum();
//limit_frame_005_total = total_salary * limit_frame_005 / 100;
//limit_frame_005_total_rounded = MyHelper.RoundOff(limit_frame_005_total.Value, 10);
total_salary = (from i in context.eva_limit_frame_employee
join j in context.eva_limit_frame_group
on i.frame_group_guid equals j.id
where j.frame_plan_guid == this.id
select i.salary).Sum();
limit_frame_005_total = total_salary * limit_frame_005 / 100;
limit_frame_005_total_rounded = MyHelper.RoundOff(limit_frame_005_total.Value, 10);
}
}

6
Models/vw_limit_frame_plan/vw_limit_frame_planService.cs
View File

@@ -256,9 +256,9 @@ namespace TodoAPI2.Models
_repository.Context.AddRange(result_frame_group);
_repository.Context.AddRange(result_frame_employee);
entity.total_salary = all_all_emp.Sum(z => z.salary);
entity.limit_frame_005_total = entity.total_salary * entity.limit_frame_005 / 100;
entity.limit_frame_005_total_rounded = MyHelper.RoundOff(entity.limit_frame_005_total.Value, 10);
//entity.total_salary = all_all_emp.Sum(z => z.salary);
//entity.limit_frame_005_total = entity.total_salary * entity.limit_frame_005 / 100;
//entity.limit_frame_005_total_rounded = MyHelper.RoundOff(entity.limit_frame_005_total.Value, 10);
entity.SetAutoField(_repository.Context);

4
Utils/MyHelper.cs
View File

@@ -426,6 +426,8 @@ public static class MyHelper
public static decimal RoundOff(decimal i, decimal round_number)
{
return (Math.Round(i / round_number)) * round_number;
string temp = i.ToString().Split(".")[0];
return Convert.ToDecimal(temp.Substring(0, temp.Length - 1)) * 10 + 10;
}
}

1
wwwroot/js/eva_limit_frame_group/eva_limit_frame_group_d.js
View File

@@ -128,6 +128,7 @@ function funcCeilCalculateSalaryLimit(params) {
var str_ceil = cal_ceil.toString();
var split_ceil = str_ceil.split('');
var num_last = Number(split_ceil[split_ceil.length - 1]);
console.log(num_last);
if (num_last) {
after_cal = num_check - num_last;
}