รวม code จากทุกคน ที่แก้ไข op ล่าสุด
This commit is contained in:
@@ -254,6 +254,8 @@ namespace TodoAPI2.Models
|
||||
if (theemp.salary.HasValue)
|
||||
{
|
||||
n.sarary = theemp.salary;
|
||||
if (n.sarary < 13285) n.cost_living = 1000;
|
||||
else n.cost_living = 0;
|
||||
sum_salary += n.sarary.Value;
|
||||
}
|
||||
else
|
||||
@@ -262,21 +264,23 @@ namespace TodoAPI2.Models
|
||||
}
|
||||
|
||||
var c = getCylinderForEmployee(theemp, cylinder);
|
||||
|
||||
n.cost_living = 0;
|
||||
n.middle = 0;
|
||||
|
||||
n.middle = 0;
|
||||
|
||||
if (c != null)
|
||||
{
|
||||
n.middle = c.middle;
|
||||
n.cost_living = c.cost_living;
|
||||
}
|
||||
|
||||
n.promoted_percentage = 0;
|
||||
n.total_promote = 0;
|
||||
n.promoted_percentage = 0; // ร้อยละที่ได้เลื่อน
|
||||
n.total_promote = 0; // จำนวนเงินที่ได้เลื่อน
|
||||
n.new_sarary = n.sarary;
|
||||
n.new_cost_living = n.cost_living;
|
||||
n.remark = null;
|
||||
if(theemp.worked_month < 4)
|
||||
{
|
||||
n.remark = "ปฏิบัติงานไม่ครบ 4 เดือน";
|
||||
}
|
||||
|
||||
n.receive_quota = 0;
|
||||
n.new_sarary_with_quota = n.sarary;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user