แจ้งเตือนเครื่องราช
This commit is contained in:
parent
70e59fb04c
commit
6ad93161c8
10 changed files with 33094 additions and 265 deletions
|
|
@ -5858,259 +5858,261 @@ namespace BMA.EHR.Application.Repositories
|
||||||
Status = h.Status,
|
Status = h.Status,
|
||||||
RequestNote = h.ReasonReject,
|
RequestNote = h.ReasonReject,
|
||||||
Reason = h.Reason,
|
Reason = h.Reason,
|
||||||
MarkALert = h.MarkALert == null ? new List<string>() : JsonConvert.DeserializeObject<List<string>>(h.MarkALert),
|
MarkDiscipline = h.MarkDiscipline,
|
||||||
|
MarkLeave = h.MarkLeave,
|
||||||
|
MarkRate = h.MarkRate,
|
||||||
// Docs = GetDocFile(h.Profile.Id),
|
// Docs = GetDocFile(h.Profile.Id),
|
||||||
MatchingConditions = h.MatchingConditions == null ? null : JsonConvert.DeserializeObject<List<MatchingCondition>>(h.MatchingConditions)
|
MatchingConditions = h.MatchingConditions == null ? null : JsonConvert.DeserializeObject<List<MatchingCondition>>(h.MatchingConditions)
|
||||||
})).ToList();
|
})).ToList();
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
{
|
{
|
||||||
throw;
|
throw;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// เช็คข้อมูลนำเข้า กับข้อมูลที่อยู่ใน database
|
// เช็คข้อมูลนำเข้า กับข้อมูลที่อยู่ใน database
|
||||||
// public async List<InsigniaRequestProfile> GetDuplicate(List<InsigniaRequestProfile> income, Guid period, Guid ocId, bool Duplicate = false)
|
// public async List<InsigniaRequestProfile> GetDuplicate(List<InsigniaRequestProfile> income, Guid period, Guid ocId, bool Duplicate = false)
|
||||||
// {
|
// {
|
||||||
// try
|
// try
|
||||||
// {
|
// {
|
||||||
// var id = GetRequestId(period, ocId);
|
// var id = GetRequestId(period, ocId);
|
||||||
|
|
||||||
// var req = await _dbContext.Set<InsigniaRequests>().FirstOrDefault(x => x.Id == id);
|
// var req = await _dbContext.Set<InsigniaRequests>().FirstOrDefault(x => x.Id == id);
|
||||||
|
|
||||||
// if (req == null)
|
// if (req == null)
|
||||||
// throw new Exception(GlobalMessages.InsigniaNotFound);
|
// throw new Exception(GlobalMessages.InsigniaNotFound);
|
||||||
|
|
||||||
// var profile = await _dbContext.Set<InsigniaRequestsProfiles>().AsQueryable()
|
// var profile = await _dbContext.Set<InsigniaRequestsProfiles>().AsQueryable()
|
||||||
// .Include(x => x.RequestInsignia)
|
// .Include(x => x.RequestInsignia)
|
||||||
// .ThenInclude(x => x.InsigniaType)
|
// .ThenInclude(x => x.InsigniaType)
|
||||||
// .Include(x => x.Profile)
|
// .Include(x => x.Profile)
|
||||||
// .ThenInclude(x => x.Insignias)
|
// .ThenInclude(x => x.Insignias)
|
||||||
// .Where(x => x.Request.Id == id)
|
// .Where(x => x.Request.Id == id)
|
||||||
// .Select(h => new DuplicateProfile
|
// .Select(h => new DuplicateProfile
|
||||||
// {
|
// {
|
||||||
// ProfileId = h.Profile.Id,
|
// ProfileId = h.Profile.Id,
|
||||||
// IsApprove = h.IsApprove,
|
// IsApprove = h.IsApprove,
|
||||||
// RequestQualificationStatus = h.QualificationStatus,
|
// RequestQualificationStatus = h.QualificationStatus,
|
||||||
// RequestDocumentStatus = h.DocumentStatus,
|
// RequestDocumentStatus = h.DocumentStatus,
|
||||||
// Special = h.Special
|
// Special = h.Special
|
||||||
// });
|
// });
|
||||||
|
|
||||||
// var newIncome = income.GroupJoin(profile,
|
// var newIncome = income.GroupJoin(profile,
|
||||||
// pdb => pdb.Profile.Id,
|
// pdb => pdb.Profile.Id,
|
||||||
// dp => dp.ProfileId,
|
// dp => dp.ProfileId,
|
||||||
// (pdb, dp) => new
|
// (pdb, dp) => new
|
||||||
// {
|
// {
|
||||||
// Profile = pdb.Profile,
|
// Profile = pdb.Profile,
|
||||||
// pdb.Profile.Insignias,
|
// pdb.Profile.Insignias,
|
||||||
// pdb.RequestInsignia,
|
// pdb.RequestInsignia,
|
||||||
// //pdb.RequestInsignia.InsigniaType,
|
// //pdb.RequestInsignia.InsigniaType,
|
||||||
// pdb.Salary,
|
// pdb.Salary,
|
||||||
// pdb.RequestDate,
|
// pdb.RequestDate,
|
||||||
// ProfileDB = dp
|
// ProfileDB = dp
|
||||||
// })
|
// })
|
||||||
// .ToList()
|
// .ToList()
|
||||||
// .Where(d => !Duplicate ? d.ProfileDB.Count() == 0 : d.ProfileDB.Count() != 0)
|
// .Where(d => !Duplicate ? d.ProfileDB.Count() == 0 : d.ProfileDB.Count() != 0)
|
||||||
// .Select(d => !Duplicate ? new InsigniaRequestProfile
|
// .Select(d => !Duplicate ? new InsigniaRequestProfile
|
||||||
// {
|
// {
|
||||||
// Request = req,
|
// Request = req,
|
||||||
// Profile = d.Profile,
|
// Profile = d.Profile,
|
||||||
// RequestInsignia = d.RequestInsignia,
|
// RequestInsignia = d.RequestInsignia,
|
||||||
// Salary = d.Salary,
|
// Salary = d.Salary,
|
||||||
// RequestDate = d.RequestDate,
|
// RequestDate = d.RequestDate,
|
||||||
// } : new InsigniaRequestProfile
|
// } : new InsigniaRequestProfile
|
||||||
// {
|
// {
|
||||||
// Request = req,
|
// Request = req,
|
||||||
// Profile = d.Profile,
|
// Profile = d.Profile,
|
||||||
// RequestInsignia = d.RequestInsignia,
|
// RequestInsignia = d.RequestInsignia,
|
||||||
// Salary = d.Salary,
|
// Salary = d.Salary,
|
||||||
// RequestDate = d.RequestDate,
|
// RequestDate = d.RequestDate,
|
||||||
// IsApprove = d.ProfileDB.First().IsApprove,
|
// IsApprove = d.ProfileDB.First().IsApprove,
|
||||||
// QualificationStatus = d.ProfileDB.First().RequestQualificationStatus,
|
// QualificationStatus = d.ProfileDB.First().RequestQualificationStatus,
|
||||||
// DocumentStatus = d.ProfileDB.First().RequestDocumentStatus,
|
// DocumentStatus = d.ProfileDB.First().RequestDocumentStatus,
|
||||||
// Special = d.ProfileDB.First().Special
|
// Special = d.ProfileDB.First().Special
|
||||||
// })
|
// })
|
||||||
// .ToList();
|
// .ToList();
|
||||||
|
|
||||||
// return newIncome;
|
// return newIncome;
|
||||||
// }
|
// }
|
||||||
// catch
|
// catch
|
||||||
// {
|
// {
|
||||||
// throw;
|
// throw;
|
||||||
// }
|
// }
|
||||||
// }
|
// }
|
||||||
|
|
||||||
// ลบข้อมูลใน db ที่ไม่เท่ากับ income
|
// ลบข้อมูลใน db ที่ไม่เท่ากับ income
|
||||||
// public async List<InsigniaRequestProfile> DeleteProfile(List<InsigniaRequestProfile> income, Guid period, Guid ocId)
|
// public async List<InsigniaRequestProfile> DeleteProfile(List<InsigniaRequestProfile> income, Guid period, Guid ocId)
|
||||||
// {
|
// {
|
||||||
// try
|
// try
|
||||||
// {
|
// {
|
||||||
// var id = GetRequestId(period, ocId);
|
// var id = GetRequestId(period, ocId);
|
||||||
|
|
||||||
// var incomProfileId = income.Select(i => i.Profile.Id).ToList();
|
// var incomProfileId = income.Select(i => i.Profile.Id).ToList();
|
||||||
|
|
||||||
// var arrayData = await _dbContext.Set<InsigniaRequestsProfiles>().AsQueryable()
|
// var arrayData = await _dbContext.Set<InsigniaRequestsProfiles>().AsQueryable()
|
||||||
// .Where(i => !(incomProfileId.Contains(i.Profile.Id)) && i.Request.Id == id)
|
// .Where(i => !(incomProfileId.Contains(i.Profile.Id)) && i.Request.Id == id)
|
||||||
// .ToList();
|
// .ToList();
|
||||||
|
|
||||||
// return arrayData;
|
// return arrayData;
|
||||||
// }
|
// }
|
||||||
// catch
|
// catch
|
||||||
// {
|
// {
|
||||||
// throw;
|
// throw;
|
||||||
// }
|
// }
|
||||||
// }
|
// }
|
||||||
|
|
||||||
// insert candidate list
|
// insert candidate list
|
||||||
public async Task InsertCandidate(Guid periodId, Guid ocId, List<InsigniaResultSet> items)
|
public async Task InsertCandidate(Guid periodId, Guid ocId, List<InsigniaResultSet> items)
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
{
|
||||||
var period = await _dbContext.Set<InsigniaPeriod>().FirstOrDefaultAsync(p => p.Id == periodId);
|
try
|
||||||
|
|
||||||
if (period == null)
|
|
||||||
throw new Exception(GlobalMessages.CoinPeriodNotFound);
|
|
||||||
|
|
||||||
var periodOlds = await _dbContext.Set<InsigniaPeriod>().Where(p => p.Year == period.Year).ToListAsync();
|
|
||||||
foreach (var periodOld in periodOlds)
|
|
||||||
{
|
{
|
||||||
var requestOlds = await _dbContext.Set<InsigniaRequest>().Where(p => p.Period == periodOld).ToListAsync();
|
var period = await _dbContext.Set<InsigniaPeriod>().FirstOrDefaultAsync(p => p.Id == periodId);
|
||||||
foreach (var requestOld in requestOlds)
|
|
||||||
|
if (period == null)
|
||||||
|
throw new Exception(GlobalMessages.CoinPeriodNotFound);
|
||||||
|
|
||||||
|
var periodOlds = await _dbContext.Set<InsigniaPeriod>().Where(p => p.Year == period.Year).ToListAsync();
|
||||||
|
foreach (var periodOld in periodOlds)
|
||||||
{
|
{
|
||||||
var profileOlds = await _dbContext.Set<InsigniaRequestProfile>().Where(p => p.Request == requestOld).Select(x => x.Profile.Id).ToListAsync();
|
var requestOlds = await _dbContext.Set<InsigniaRequest>().Where(p => p.Period == periodOld).ToListAsync();
|
||||||
items = items.Where(x => !profileOlds.Contains(x.ProfileId)).ToList();
|
foreach (var requestOld in requestOlds)
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
var oc = await _dbContext.Set<OrganizationEntity>().FirstOrDefaultAsync(x => x.Id == ocId);
|
|
||||||
|
|
||||||
if (oc == null)
|
|
||||||
throw new Exception(GlobalMessages.OCNotFound);
|
|
||||||
|
|
||||||
var req = new InsigniaRequest
|
|
||||||
{
|
|
||||||
Period = period,
|
|
||||||
Organization = oc,
|
|
||||||
RequestStatus = "st1",
|
|
||||||
RequestNote = "",
|
|
||||||
CreatedUserId = UserId ?? "System Administrator",
|
|
||||||
CreatedFullName = FullName ?? "",
|
|
||||||
CreatedAt = DateTime.Now,
|
|
||||||
LastUpdateFullName = FullName ?? "System Administrator",
|
|
||||||
LastUpdateUserId = UserId ?? "",
|
|
||||||
LastUpdatedAt = DateTime.Now,
|
|
||||||
};
|
|
||||||
|
|
||||||
foreach (var item in items)
|
|
||||||
{
|
|
||||||
var pf = await _dbContext.Set<Profile>().FirstOrDefaultAsync(p => p.Id == item.ProfileId);
|
|
||||||
var req_insignia = await _dbContext.Set<Insignia>().FirstOrDefaultAsync(i => i.Id == item.RequestInsignia.Id);
|
|
||||||
|
|
||||||
if (pf != null)
|
|
||||||
{
|
|
||||||
req.RequestProfiles.Add(new InsigniaRequestProfile
|
|
||||||
{
|
{
|
||||||
Status = "PENDING",
|
var profileOlds = await _dbContext.Set<InsigniaRequestProfile>().Where(p => p.Request == requestOld).Select(x => x.Profile.Id).ToListAsync();
|
||||||
Profile = pf,
|
items = items.Where(x => !profileOlds.Contains(x.ProfileId)).ToList();
|
||||||
RequestInsignia = req_insignia,
|
}
|
||||||
Salary = item.Salary == null ? null : item.Salary,
|
|
||||||
RequestDate = DateTime.Now,
|
|
||||||
MatchingConditions = System.Text.Json.JsonSerializer.Serialize(item.MatchingConditions), // serialize to string
|
|
||||||
CreatedUserId = UserId ?? "System Administrator",
|
|
||||||
CreatedFullName = FullName ?? "",
|
|
||||||
CreatedAt = DateTime.Now,
|
|
||||||
LastUpdateFullName = FullName ?? "System Administrator",
|
|
||||||
LastUpdateUserId = UserId ?? "",
|
|
||||||
LastUpdatedAt = DateTime.Now,
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var oc = await _dbContext.Set<OrganizationEntity>().FirstOrDefaultAsync(x => x.Id == ocId);
|
||||||
|
|
||||||
|
if (oc == null)
|
||||||
|
throw new Exception(GlobalMessages.OCNotFound);
|
||||||
|
|
||||||
|
var req = new InsigniaRequest
|
||||||
|
{
|
||||||
|
Period = period,
|
||||||
|
Organization = oc,
|
||||||
|
RequestStatus = "st1",
|
||||||
|
RequestNote = "",
|
||||||
|
CreatedUserId = UserId ?? "System Administrator",
|
||||||
|
CreatedFullName = FullName ?? "",
|
||||||
|
CreatedAt = DateTime.Now,
|
||||||
|
LastUpdateFullName = FullName ?? "System Administrator",
|
||||||
|
LastUpdateUserId = UserId ?? "",
|
||||||
|
LastUpdatedAt = DateTime.Now,
|
||||||
|
};
|
||||||
|
|
||||||
|
foreach (var item in items)
|
||||||
|
{
|
||||||
|
var pf = await _dbContext.Set<Profile>().FirstOrDefaultAsync(p => p.Id == item.ProfileId);
|
||||||
|
var req_insignia = await _dbContext.Set<Insignia>().FirstOrDefaultAsync(i => i.Id == item.RequestInsignia.Id);
|
||||||
|
|
||||||
|
if (pf != null)
|
||||||
|
{
|
||||||
|
req.RequestProfiles.Add(new InsigniaRequestProfile
|
||||||
|
{
|
||||||
|
Status = "PENDING",
|
||||||
|
Profile = pf,
|
||||||
|
RequestInsignia = req_insignia,
|
||||||
|
Salary = item.Salary == null ? null : item.Salary,
|
||||||
|
RequestDate = DateTime.Now,
|
||||||
|
MatchingConditions = System.Text.Json.JsonSerializer.Serialize(item.MatchingConditions), // serialize to string
|
||||||
|
CreatedUserId = UserId ?? "System Administrator",
|
||||||
|
CreatedFullName = FullName ?? "",
|
||||||
|
CreatedAt = DateTime.Now,
|
||||||
|
LastUpdateFullName = FullName ?? "System Administrator",
|
||||||
|
LastUpdateUserId = UserId ?? "",
|
||||||
|
LastUpdatedAt = DateTime.Now,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
await _dbContext.Set<InsigniaRequest>().AddAsync(req);
|
||||||
|
await _dbContext.SaveChangesAsync();
|
||||||
}
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
await _dbContext.Set<InsigniaRequest>().AddAsync(req);
|
// เช็คข้อมูลใน kp7insignia
|
||||||
await _dbContext.SaveChangesAsync();
|
// public async ProfileInsignia ListKp7Insignia(string name, string profile, int year)
|
||||||
}
|
// {
|
||||||
catch
|
// try
|
||||||
{
|
// {
|
||||||
throw;
|
// var item = await _dbContext.Set<ProfileInsignias>().AsQueryable()
|
||||||
}
|
// .Include(x => x.Insignia)
|
||||||
|
// .Include(x => x.Profile)
|
||||||
|
// .FirstOrDefault(x => x.Profile.Id == profile &&
|
||||||
|
// x.Year == year &&
|
||||||
|
// x.Insignia.Name.Contains(name));
|
||||||
|
|
||||||
|
// return item;
|
||||||
|
// }
|
||||||
|
// catch
|
||||||
|
// {
|
||||||
|
// throw;
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
|
// บันทึกข้อมูลลง กพ.7
|
||||||
|
// public async ProfileInsignia InsertKp7Insignia(InsigniaKp7Item kp7, InsigniaProfile profile)
|
||||||
|
// {
|
||||||
|
// try
|
||||||
|
// {
|
||||||
|
// var pf = await _dbContext.Set<Profiles>().FirstOrDefault(x => x.Id == profile.FkProfileId);
|
||||||
|
// var insignia = await _dbContext.Set<Insignias>().FirstOrDefault(x => x.Name == profile.InsigniaName);
|
||||||
|
|
||||||
|
// var kp7Insignia = new ProfileInsignia
|
||||||
|
// {
|
||||||
|
// Profile = pf,
|
||||||
|
// Year = DateTime.Now.Year,
|
||||||
|
// DateReceive = kp7.InsigniaDatereceive.Value,
|
||||||
|
// Insignia = insignia,
|
||||||
|
// Level = kp7.InsigniaLevel,
|
||||||
|
// No = profile.InsigniaNo,
|
||||||
|
// Issue = kp7.InsigniaIssue,
|
||||||
|
// VolumeNo = kp7.InsigniaVolumeno.Value.ToString(),
|
||||||
|
// Volume = kp7.InsigniaVolume,
|
||||||
|
// Section = kp7.InsigniaSection,
|
||||||
|
// DateStamp = DateTime.Now,
|
||||||
|
// DateAnnounce = kp7.InsigniaDateannounce.Value,
|
||||||
|
// Page = profile.InsigniaPage,
|
||||||
|
// };
|
||||||
|
|
||||||
|
// return kp7Insignia;
|
||||||
|
// }
|
||||||
|
// catch
|
||||||
|
// {
|
||||||
|
// throw;
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
|
// update กพ.7
|
||||||
|
// public async ProfileInsignia UpdateKp7Insignia(Guid id)
|
||||||
|
// {
|
||||||
|
// try
|
||||||
|
// {
|
||||||
|
// var item = await _dbContext.Set<ProfileInsignias>().FirstOrDefaultAsync(x => x.Id == id);
|
||||||
|
|
||||||
|
// return item;
|
||||||
|
// }
|
||||||
|
// catch
|
||||||
|
// {
|
||||||
|
// throw;
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
|
#endregion
|
||||||
}
|
}
|
||||||
|
|
||||||
// เช็คข้อมูลใน kp7insignia
|
|
||||||
// public async ProfileInsignia ListKp7Insignia(string name, string profile, int year)
|
|
||||||
// {
|
|
||||||
// try
|
|
||||||
// {
|
|
||||||
// var item = await _dbContext.Set<ProfileInsignias>().AsQueryable()
|
|
||||||
// .Include(x => x.Insignia)
|
|
||||||
// .Include(x => x.Profile)
|
|
||||||
// .FirstOrDefault(x => x.Profile.Id == profile &&
|
|
||||||
// x.Year == year &&
|
|
||||||
// x.Insignia.Name.Contains(name));
|
|
||||||
|
|
||||||
// return item;
|
|
||||||
// }
|
|
||||||
// catch
|
|
||||||
// {
|
|
||||||
// throw;
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
||||||
// บันทึกข้อมูลลง กพ.7
|
|
||||||
// public async ProfileInsignia InsertKp7Insignia(InsigniaKp7Item kp7, InsigniaProfile profile)
|
|
||||||
// {
|
|
||||||
// try
|
|
||||||
// {
|
|
||||||
// var pf = await _dbContext.Set<Profiles>().FirstOrDefault(x => x.Id == profile.FkProfileId);
|
|
||||||
// var insignia = await _dbContext.Set<Insignias>().FirstOrDefault(x => x.Name == profile.InsigniaName);
|
|
||||||
|
|
||||||
// var kp7Insignia = new ProfileInsignia
|
|
||||||
// {
|
|
||||||
// Profile = pf,
|
|
||||||
// Year = DateTime.Now.Year,
|
|
||||||
// DateReceive = kp7.InsigniaDatereceive.Value,
|
|
||||||
// Insignia = insignia,
|
|
||||||
// Level = kp7.InsigniaLevel,
|
|
||||||
// No = profile.InsigniaNo,
|
|
||||||
// Issue = kp7.InsigniaIssue,
|
|
||||||
// VolumeNo = kp7.InsigniaVolumeno.Value.ToString(),
|
|
||||||
// Volume = kp7.InsigniaVolume,
|
|
||||||
// Section = kp7.InsigniaSection,
|
|
||||||
// DateStamp = DateTime.Now,
|
|
||||||
// DateAnnounce = kp7.InsigniaDateannounce.Value,
|
|
||||||
// Page = profile.InsigniaPage,
|
|
||||||
// };
|
|
||||||
|
|
||||||
// return kp7Insignia;
|
|
||||||
// }
|
|
||||||
// catch
|
|
||||||
// {
|
|
||||||
// throw;
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
||||||
// update กพ.7
|
|
||||||
// public async ProfileInsignia UpdateKp7Insignia(Guid id)
|
|
||||||
// {
|
|
||||||
// try
|
|
||||||
// {
|
|
||||||
// var item = await _dbContext.Set<ProfileInsignias>().FirstOrDefaultAsync(x => x.Id == id);
|
|
||||||
|
|
||||||
// return item;
|
|
||||||
// }
|
|
||||||
// catch
|
|
||||||
// {
|
|
||||||
// throw;
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -18,9 +18,11 @@
|
||||||
public string Status { get; set; }
|
public string Status { get; set; }
|
||||||
public bool IsApprove { get; set; }
|
public bool IsApprove { get; set; }
|
||||||
public DateTime? RequestDate { get; set; }
|
public DateTime? RequestDate { get; set; }
|
||||||
public List<string> MarkALert { get; set; }
|
|
||||||
public string? RequestNote { get; set; }
|
public string? RequestNote { get; set; }
|
||||||
public string? Reason { get; set; }
|
public string? Reason { get; set; }
|
||||||
|
public bool? MarkDiscipline { get; set; }
|
||||||
|
public bool? MarkLeave { get; set; }
|
||||||
|
public bool? MarkRate { get; set; }
|
||||||
public List<InsigniaRequestDoc>? Docs { get; set; }
|
public List<InsigniaRequestDoc>? Docs { get; set; }
|
||||||
|
|
||||||
public List<MatchingCondition> MatchingConditions { get; set; } = new List<MatchingCondition>();
|
public List<MatchingCondition> MatchingConditions { get; set; } = new List<MatchingCondition>();
|
||||||
|
|
|
||||||
|
|
@ -40,8 +40,14 @@ namespace BMA.EHR.Domain.Models.Insignias
|
||||||
[Comment("เหตุผลการได้รับเครื่องราชฯ")]
|
[Comment("เหตุผลการได้รับเครื่องราชฯ")]
|
||||||
public string? Reason { get; set; }
|
public string? Reason { get; set; }
|
||||||
|
|
||||||
[Comment("มาร์คแจ้งเตือนความผิด")]
|
[Comment("แจ้งเตือน มีโทษทางวินัย")]
|
||||||
public string? MarkALert { get; set; }
|
public bool? MarkDiscipline { get; set; } = false;
|
||||||
|
|
||||||
|
[Comment("แจ้งเตือน ไม่ได้เลื่อนเงินเดือน/ไม่ได้เลื่อนขั้น เนื่องจากลาเกิน")]
|
||||||
|
public bool? MarkLeave { get; set; } = false;
|
||||||
|
|
||||||
|
[Comment("แจ้งเตือน ผลการประเมินการปฏิบัติราชการในรอบ 5 ปี ต่ำกว่าระดับดี (น้อยกว่าร้อยละ 70)")]
|
||||||
|
public bool? MarkRate { get; set; } = false;
|
||||||
|
|
||||||
public Profile Profile { get; set; }
|
public Profile Profile { get; set; }
|
||||||
|
|
||||||
|
|
|
||||||
16380
BMA.EHR.Infrastructure/Migrations/20230927071559_update table insignianoteprofile add alert1.Designer.cs
generated
Normal file
16380
BMA.EHR.Infrastructure/Migrations/20230927071559_update table insignianoteprofile add alert1.Designer.cs
generated
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -0,0 +1,63 @@
|
||||||
|
using Microsoft.EntityFrameworkCore.Migrations;
|
||||||
|
|
||||||
|
#nullable disable
|
||||||
|
|
||||||
|
namespace BMA.EHR.Infrastructure.Migrations
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
public partial class updatetableinsignianoteprofileaddalert1 : Migration
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Up(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.DropColumn(
|
||||||
|
name: "MarkALert",
|
||||||
|
table: "InsigniaRequestProfiles");
|
||||||
|
|
||||||
|
migrationBuilder.AddColumn<bool>(
|
||||||
|
name: "MarkDiscipline",
|
||||||
|
table: "InsigniaRequestProfiles",
|
||||||
|
type: "tinyint(1)",
|
||||||
|
nullable: true,
|
||||||
|
comment: "แจ้งเตือน มีโทษทางวินัย");
|
||||||
|
|
||||||
|
migrationBuilder.AddColumn<bool>(
|
||||||
|
name: "MarkLeave",
|
||||||
|
table: "InsigniaRequestProfiles",
|
||||||
|
type: "tinyint(1)",
|
||||||
|
nullable: true,
|
||||||
|
comment: "แจ้งเตือน ไม่ได้เลื่อนเงินเดือน/ไม่ได้เลื่อนขั้น เนื่องจากลาเกิน");
|
||||||
|
|
||||||
|
migrationBuilder.AddColumn<bool>(
|
||||||
|
name: "MarkRate",
|
||||||
|
table: "InsigniaRequestProfiles",
|
||||||
|
type: "tinyint(1)",
|
||||||
|
nullable: true,
|
||||||
|
comment: "แจ้งเตือน ผลการประเมินการปฏิบัติราชการในรอบ 5 ปี ต่ำกว่าระดับดี (น้อยกว่าร้อยละ 70)");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Down(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.DropColumn(
|
||||||
|
name: "MarkDiscipline",
|
||||||
|
table: "InsigniaRequestProfiles");
|
||||||
|
|
||||||
|
migrationBuilder.DropColumn(
|
||||||
|
name: "MarkLeave",
|
||||||
|
table: "InsigniaRequestProfiles");
|
||||||
|
|
||||||
|
migrationBuilder.DropColumn(
|
||||||
|
name: "MarkRate",
|
||||||
|
table: "InsigniaRequestProfiles");
|
||||||
|
|
||||||
|
migrationBuilder.AddColumn<string>(
|
||||||
|
name: "MarkALert",
|
||||||
|
table: "InsigniaRequestProfiles",
|
||||||
|
type: "longtext",
|
||||||
|
nullable: true,
|
||||||
|
comment: "มาร์คแจ้งเตือนความผิด")
|
||||||
|
.Annotation("MySql:CharSet", "utf8mb4");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
16380
BMA.EHR.Infrastructure/Migrations/20230927073012_update table insignianoteprofile add alert2.Designer.cs
generated
Normal file
16380
BMA.EHR.Infrastructure/Migrations/20230927073012_update table insignianoteprofile add alert2.Designer.cs
generated
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -0,0 +1,22 @@
|
||||||
|
using Microsoft.EntityFrameworkCore.Migrations;
|
||||||
|
|
||||||
|
#nullable disable
|
||||||
|
|
||||||
|
namespace BMA.EHR.Infrastructure.Migrations
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
public partial class updatetableinsignianoteprofileaddalert2 : Migration
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Up(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Down(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -6004,9 +6004,17 @@ namespace BMA.EHR.Infrastructure.Migrations
|
||||||
.HasColumnOrder(102)
|
.HasColumnOrder(102)
|
||||||
.HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
|
.HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
|
||||||
|
|
||||||
b.Property<string>("MarkALert")
|
b.Property<bool>("MarkDiscipline")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("tinyint(1)")
|
||||||
.HasComment("มาร์คแจ้งเตือนความผิด");
|
.HasComment("แจ้งเตือน มีโทษทางวินัย");
|
||||||
|
|
||||||
|
b.Property<bool>("MarkLeave")
|
||||||
|
.HasColumnType("tinyint(1)")
|
||||||
|
.HasComment("แจ้งเตือน ไม่ได้เลื่อนเงินเดือน/ไม่ได้เลื่อนขั้น เนื่องจากลาเกิน");
|
||||||
|
|
||||||
|
b.Property<bool>("MarkRate")
|
||||||
|
.HasColumnType("tinyint(1)")
|
||||||
|
.HasComment("แจ้งเตือน ผลการประเมินการปฏิบัติราชการในรอบ 5 ปี ต่ำกว่าระดับดี (น้อยกว่าร้อยละ 70)");
|
||||||
|
|
||||||
b.Property<string>("MatchingConditions")
|
b.Property<string>("MatchingConditions")
|
||||||
.HasColumnType("text")
|
.HasColumnType("text")
|
||||||
|
|
|
||||||
|
|
@ -866,30 +866,6 @@ namespace BMA.EHR.Insignia.Service.Controllers
|
||||||
// }
|
// }
|
||||||
// #endregion
|
// #endregion
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Mark แจ้งเตือนเงื่อนไขได้รับเครื่องราช
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="insigniaRequestProfileId">Id รายชื่อคนที่ยื่นของในรอบ</param>
|
|
||||||
/// <returns></returns>
|
|
||||||
/// <response code="200"></response>
|
|
||||||
/// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
|
|
||||||
/// <response code="401">ไม่ได้ Login เข้าระบบ</response>
|
|
||||||
/// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
|
|
||||||
[HttpPut("alert/{insigniaRequestProfileId:length(36)}")]
|
|
||||||
public async Task<ActionResult<ResponseObject>> MarkAlertProfileInsignia([FromBody] InsigniaMarkAlertRequest req, Guid insigniaRequestProfileId)
|
|
||||||
{
|
|
||||||
var insigniaRequestProfile = await _context.InsigniaRequestProfiles.FirstOrDefaultAsync(x => x.Id == insigniaRequestProfileId);
|
|
||||||
if (insigniaRequestProfile == null)
|
|
||||||
return Error(GlobalMessages.InsigniaRequestProfileNotFound);
|
|
||||||
insigniaRequestProfile.MarkALert = JsonConvert.SerializeObject(req.Alert);
|
|
||||||
insigniaRequestProfile.LastUpdateFullName = FullName ?? "System Administrator";
|
|
||||||
insigniaRequestProfile.LastUpdateUserId = UserId ?? "";
|
|
||||||
insigniaRequestProfile.LastUpdatedAt = DateTime.Now;
|
|
||||||
_context.SaveChanges();
|
|
||||||
return Success();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// ย้ายขอมูลไปเป็น คนที่ไม่ยื่นขอ
|
/// ย้ายขอมูลไปเป็น คนที่ไม่ยื่นขอ
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
||||||
|
|
@ -1,10 +0,0 @@
|
||||||
using BMA.EHR.Domain.Models.MetaData;
|
|
||||||
using Microsoft.EntityFrameworkCore;
|
|
||||||
|
|
||||||
namespace BMA.EHR.Insignia.Service.Requests
|
|
||||||
{
|
|
||||||
public class InsigniaMarkAlertRequest
|
|
||||||
{
|
|
||||||
public string[] Alert { get; set; }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue