ปรับปรุงหลายข้อ

This commit is contained in:
LAPTOP-KB8JC2K2\acer
2021-09-14 15:52:06 +07:00
parent d4212da199
commit 7fdf9f7b01
26 changed files with 2316 additions and 14 deletions

View File

@@ -191,6 +191,9 @@ namespace TodoAPI2.Models
public int? order_of_data { get; set; }
public int? help_org_id { get; set; }
[MaxLength(1000)]
public string remark { get; set; }
}
}

View File

@@ -34,6 +34,8 @@ namespace TodoAPI2.Models
public int? help_org_id { get; set; }
public string remark { get; set; }
public string active_mode { get; set; }
}
}

View File

@@ -209,7 +209,7 @@ namespace TodoAPI2.Models
employee_no = fk_external_linkageResult2.employee_no,
position_number = fk_external_linkageResult2.position_number,
position_name = fk_external_linkageResult2.position_name,
remark = null,
remark = m_eva_create_evaluation_detail.remark,
status_self_click_date = m_eva_create_evaluation_detail.status_self_click_date,
status_chief_click_date = m_eva_create_evaluation_detail.status_chief_click_date,
@@ -275,6 +275,7 @@ namespace TodoAPI2.Models
existingEntity.work_period = model.work_period;
existingEntity.order_of_data = model.order_of_data;
existingEntity.help_org_id = model.help_org_id;
existingEntity.remark = model.remark;
var updated = _repository.Update(id, existingEntity);
return Get(updated.id);
@@ -301,6 +302,7 @@ namespace TodoAPI2.Models
existingEntity.work_period = i.work_period;
existingEntity.order_of_data = i.order_of_data;
existingEntity.help_org_id = i.help_org_id;
existingEntity.remark = i.remark;
_repository.UpdateWithoutCommit(i.id.Value, existingEntity);
}

View File

@@ -122,6 +122,7 @@ namespace TodoAPI2.Models
public string txt_status_supervisor2A { get { return getStatusText(status_supervisor2A) + MyHelper.GetDateStringForReport(status_supervisor2A_click_date); } }
public string help_org_id_external_linkage_external_name { get; set; }
private string getStatusText(string s)
{
if (!string.IsNullOrEmpty(s))