ปรับรายงานให้ ไม่ตกบรรทัด
This commit is contained in:
@@ -61,5 +61,8 @@ namespace TodoAPI2.Models
|
||||
|
||||
[MaxLength(255)]
|
||||
public string target_score5 { get; set; }
|
||||
|
||||
[MaxLength(16000)]
|
||||
public string achievement_line1 { get; set; }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -144,6 +144,38 @@ namespace TodoAPI2.Models
|
||||
return newkey.Value;
|
||||
}
|
||||
|
||||
private void ManageDetail(eva_evaluation_achievementEntity entity)
|
||||
{
|
||||
var oldDetail = from x in _repository.Context.eva_evaluation_achievement_detail
|
||||
where x.achievement_id == entity.id
|
||||
select x;
|
||||
_repository.Context.eva_evaluation_achievement_detail.RemoveRange(oldDetail);
|
||||
|
||||
if (!string.IsNullOrEmpty(entity.achievement))
|
||||
{
|
||||
var sp = entity.achievement.Split("^");
|
||||
int i = 0;
|
||||
foreach (var s in sp)
|
||||
{
|
||||
if (i == 0)
|
||||
{
|
||||
entity.achievement_line1 = s.Trim();
|
||||
}
|
||||
else
|
||||
{
|
||||
var n = new eva_evaluation_achievement_detailEntity();
|
||||
n.id = Guid.NewGuid();
|
||||
n.achievement_order = i;
|
||||
n.achievement_id = entity.id;
|
||||
n.achievement_detail = s.Trim();
|
||||
_repository.Context.Add(n);
|
||||
}
|
||||
i++;
|
||||
}
|
||||
_repository.Context.SaveChanges();
|
||||
}
|
||||
}
|
||||
|
||||
public eva_evaluation_achievementViewModel Insert(eva_evaluation_achievementInputModel model)
|
||||
{
|
||||
var entity = GetEntity(model);
|
||||
@@ -176,6 +208,7 @@ namespace TodoAPI2.Models
|
||||
}
|
||||
|
||||
var inserted = _repository.Insert(entity);
|
||||
ManageDetail(inserted);
|
||||
|
||||
return Get(inserted.id);
|
||||
}
|
||||
@@ -235,6 +268,7 @@ namespace TodoAPI2.Models
|
||||
|
||||
|
||||
var updated = _repository.Update(id, existingEntity);
|
||||
ManageDetail(updated);
|
||||
return Get(updated.id);
|
||||
}
|
||||
else
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using TTSW.EF;
|
||||
using TTSW.Utils;
|
||||
using TTSW.Constant;
|
||||
using TTSW.Common;
|
||||
using System.IO;
|
||||
|
||||
namespace TodoAPI2.Models
|
||||
{
|
||||
public class eva_evaluation_achievement_detailEntity : BaseEntity2<Guid>
|
||||
{
|
||||
[ForeignKey("achievement_id")]
|
||||
public eva_evaluation_achievementEntity eva_evaluation_achievement { get; set; }
|
||||
public int? achievement_id { get; set; }
|
||||
|
||||
[MaxLength(16000)]
|
||||
public string achievement_detail { get; set; }
|
||||
|
||||
public int? achievement_order { get; set; }
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user