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

แก้บักระบบ โดยต้น นคร

Browse Source
This commit is contained in:
Nakorn Rientrakrunchai
2020-04-06 16:40:05 +07:00
parent 39c11f277a
commit b3c7cd12d8
11 changed files with 82 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Models/eva_create_evaluation_detail/eva_create_evaluation_detailService.cs
View File

@@ -317,7 +317,7 @@ namespace TodoAPI2.Models
p.id = k1;
p.create_evaluation_detail_id = n.id;
p.behavior = k.competency_code + " " + k.competency_topic;
p.weight = 0;
p.weight = 20;
p.created = DateTime.Now;
p.updated = DateTime.Now;
p.isActive = true;

10
Models/eva_evaluation_behavior/eva_evaluation_behaviorInputModel.cs
View File

@@ -22,6 +22,16 @@ namespace TodoAPI2.Models
public decimal? weight { get; set; }
public string target_score1 { get; set; }
public string target_score2 { get; set; }
public string target_score3 { get; set; }
public string target_score4 { get; set; }
public string target_score5 { get; set; }
public string active_mode { get; set; }
}
}

17
Models/eva_evaluation_behavior/eva_evaluation_behaviorService.cs
View File

@@ -103,6 +103,11 @@ namespace TodoAPI2.Models
create_evaluation_detail_id = m_eva_evaluation_behavior.create_evaluation_detail_id,
behavior = m_eva_evaluation_behavior.behavior,
weight = m_eva_evaluation_behavior.weight,
target_score1 = m_eva_evaluation_behavior.target_score1,
target_score2 = m_eva_evaluation_behavior.target_score2,
target_score3 = m_eva_evaluation_behavior.target_score3,
target_score4 = m_eva_evaluation_behavior.target_score4,
target_score5 = m_eva_evaluation_behavior.target_score5,
create_evaluation_detail_id_eva_create_evaluation_detail_create_evaluation_id = fk_eva_create_evaluation_detailResult1.create_evaluation_id,
@@ -193,7 +198,11 @@ namespace TodoAPI2.Models
existingEntity.create_evaluation_detail_id = model.create_evaluation_detail_id;
existingEntity.behavior = model.behavior;
existingEntity.weight = model.weight;
existingEntity.target_score1 = model.target_score1;
existingEntity.target_score2 = model.target_score2;
existingEntity.target_score3 = model.target_score3;
existingEntity.target_score4 = model.target_score4;
existingEntity.target_score5 = model.target_score5;
var updated = _repository.Update(id, existingEntity);
return Get(updated.id);
@@ -223,7 +232,11 @@ namespace TodoAPI2.Models
existingEntity.create_evaluation_detail_id = i.create_evaluation_detail_id;
existingEntity.behavior = i.behavior;
existingEntity.weight = i.weight;
existingEntity.target_score1 = i.target_score1;
existingEntity.target_score2 = i.target_score2;
existingEntity.target_score3 = i.target_score3;
existingEntity.target_score4 = i.target_score4;
existingEntity.target_score5 = i.target_score5;
_repository.UpdateWithoutCommit(i.id.Value, existingEntity);
}

10
Models/eva_evaluation_behavior/eva_evaluation_behaviorViewModel.cs
View File

@@ -20,6 +20,16 @@ namespace TodoAPI2.Models
public decimal? weight { get; set; }
public string target_score1 { get; set; }
public string target_score2 { get; set; }
public string target_score3 { get; set; }
public string target_score4 { get; set; }
public string target_score5 { get; set; }
public int? create_evaluation_detail_id_eva_create_evaluation_detail_create_evaluation_id { get; set; }
}

2
Models/external_linkage/external_linkageService.cs
View File

@@ -249,7 +249,7 @@ namespace TodoAPI2.Models
public List<external_linkageViewModel> GetDepartmentData()
{
var sql = string.Format("select * from public.{0}DepartmentData{0} where department_name != ''; ",'"'.ToString());
var sql = string.Format("select * from public.{0}DepartmentData{0} where department_name != '' and deleted_at is null; ", '"'.ToString());
var para = db.GetParameterListNpgsql();
DataTable dt = db.ExecuteDataTableNpgsql(sql, para);
var result = new List<external_linkageViewModel>();