hrms-bangkok/hrms-api-backend
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

Merge branch 'develop' into working

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2024-07-01 21:54:54 +07:00
commit 320fb3386e
6 changed files with 92 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

74
BMA.EHR.Application/Repositories/Commands/CommandRepository.cs
View file

@ -239,6 +239,7 @@ namespace BMA.EHR.Application.Repositories.Commands
.Where(x => x.PlacementStatus.Trim().ToUpper() == "PREPARE-CONTAIN") .Where(x => x.PlacementStatus.Trim().ToUpper() == "PREPARE-CONTAIN")
.Where(x => x.Draft! == true) .Where(x => x.Draft! == true)
.Where(x => x.Placement!.PlacementType!.Name == "สอบแข่งขัน") .Where(x => x.Placement!.PlacementType!.Name == "สอบแข่งขัน")
.Where(x => x.typeCommand.Trim().ToUpper() == "APPOINTED")
.OrderBy(x => x.ExamNumber) .OrderBy(x => x.ExamNumber)
.ToListAsync(); .ToListAsync();
@ -297,6 +298,7 @@ namespace BMA.EHR.Application.Repositories.Commands
.Where(x => x.PlacementStatus.Trim().ToUpper() == "PREPARE-CONTAIN") .Where(x => x.PlacementStatus.Trim().ToUpper() == "PREPARE-CONTAIN")
.Where(x => x.Draft! == true) .Where(x => x.Draft! == true)
.Where(x => x.Placement!.PlacementType!.Name != "สอบแข่งขัน") .Where(x => x.Placement!.PlacementType!.Name != "สอบแข่งขัน")
.Where(x => x.typeCommand.Trim().ToUpper() == "APPOINTED")
.OrderBy(x => x.ExamNumber) .OrderBy(x => x.ExamNumber)
.ToListAsync(); .ToListAsync();
@ -354,6 +356,7 @@ namespace BMA.EHR.Application.Repositories.Commands
.Where(x => x.Placement.Id == command.Placement.Id) .Where(x => x.Placement.Id == command.Placement.Id)
.Where(x => !otherCommandReceivers.Contains(x.CitizenId!)) .Where(x => !otherCommandReceivers.Contains(x.CitizenId!))
.Where(x => x.PlacementStatus.Trim().ToUpper() == "PREPARE-CONTAIN") .Where(x => x.PlacementStatus.Trim().ToUpper() == "PREPARE-CONTAIN")
.Where(x => x.typeCommand.Trim().ToUpper() == "APPOINT")
.Where(x => x.Draft! == true) .Where(x => x.Draft! == true)
.OrderBy(x => x.ExamNumber) .OrderBy(x => x.ExamNumber)
.ToListAsync(); .ToListAsync();
@ -412,6 +415,7 @@ namespace BMA.EHR.Application.Repositories.Commands
.Where(x => x.Placement.Id == command.Placement.Id) .Where(x => x.Placement.Id == command.Placement.Id)
.Where(x => !otherCommandReceivers.Contains(x.CitizenId!)) .Where(x => !otherCommandReceivers.Contains(x.CitizenId!))
.Where(x => x.PlacementStatus.Trim().ToUpper() == "PREPARE-CONTAIN") .Where(x => x.PlacementStatus.Trim().ToUpper() == "PREPARE-CONTAIN")
.Where(x => x.typeCommand.Trim().ToUpper() == "MOVE")
.Where(x => x.Draft! == true) .Where(x => x.Draft! == true)
.OrderBy(x => x.ExamNumber) .OrderBy(x => x.ExamNumber)
.ToListAsync(); .ToListAsync();
@ -9156,8 +9160,8 @@ namespace BMA.EHR.Application.Repositories.Commands
{ {
ret.Add(new KeyValueItemResponse ret.Add(new KeyValueItemResponse
{ {
Id = raw.result!.rootId, Id = raw.result!.rootId??null,
Name = raw.result!.root, Name = raw.result!.root??null,
}); });
} }
} }
@ -9794,39 +9798,39 @@ namespace BMA.EHR.Application.Repositories.Commands
// } // }
// } // }
// var Insignias = await _dbContext.Set<ProfileInsignia>() var Insignias = await _dbContext.Set<ProfileInsignia>()
// .Include(x => x.Insignia) .Include(x => x.Insignia)
// .Where(x => orgIdSend.Contains(x.ProfileId)) .Where(x => profile.Id==x.ProfileId)
// .ToListAsync(); .ToListAsync();
// if (Insignias.Count > 0) if (Insignias.Count > 0)
// { {
// var apiUrlInsig = $"{_baseAPI}/org/dotnet/insignia/Dumb"; var apiUrlInsig = $"{_baseAPI}/org/dotnet/insignia/Dumb";
// using (var client = new HttpClient()) using (var client = new HttpClient())
// { {
// client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", "")); client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
// foreach (var insignia in Insignias) foreach (var insignia in Insignias)
// { {
// var _res = await client.PostAsJsonAsync(apiUrlInsig, new var _res = await client.PostAsJsonAsync(apiUrlInsig, new
// { {
// profileId = profile.Id, profileId = profile.Id,
// year = insignia.Year, year = insignia.Year,
// no = insignia.No, no = insignia.No,
// volume = insignia.Volume, volume = insignia.Volume,
// section = insignia.Section, section = insignia.Section,
// page = insignia.Page, page = insignia.Page,
// receiveDate = insignia.ReceiveDate, receiveDate = insignia.ReceiveDate,
// insigniaId = insignia.Insignia.Id, //where in node insigniaId = insignia.Insignia.Id, //where in node
// dateAnnounce = insignia.DateAnnounce, dateAnnounce = insignia.DateAnnounce,
// issue = insignia.Issue, issue = insignia.Issue,
// volumeNo = insignia.VolumeNo, volumeNo = insignia.VolumeNo,
// refCommandDate = insignia.RefCommandDate, refCommandDate = insignia.RefCommandDate,
// refCommandNo = insignia.RefCommandNo, refCommandNo = insignia.RefCommandNo,
// note = insignia.Note, note = insignia.Note,
// }); });
// var _result = await _res.Content.ReadAsStringAsync(); var _result = await _res.Content.ReadAsStringAsync();
// } }
// } }
// } }
// var Honor = await _dbContext.Set<ProfileHonor>() // var Honor = await _dbContext.Set<ProfileHonor>()
// .Where(x => orgIdSend.Contains(x.ProfileId)) // .Where(x => orgIdSend.Contains(x.ProfileId))

4
BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs
View file

@ -120,7 +120,7 @@ namespace BMA.EHR.Application.Repositories.Reports
{ {
profiles = profiles.OrderBy(x => x.order).ToList(); profiles = profiles.OrderBy(x => x.order).ToList();
} }
string SignDate = DateTime.Parse(retireHistorys.SignDate.ToString()).ToThaiFullDate().ToString().ToThaiNumber(); string SignDate = retireHistorys.SignDate != null ? DateTime.Parse(retireHistorys.SignDate.ToString()).ToThaiFullDate().ToString().ToThaiNumber() : "-";
return new { SignDate, retireHistorys.Detail, retireHistorys.Id, retireHistorys.CreatedAt, Year = retireHistorys.Year.ToThaiYear().ToString().ToThaiNumber(), retireHistorys.Round, retireHistorys.Type, retireHistorys.TypeReport, Total = retireHistorys.Total.ToString().ToThaiNumber(), profile = profiles }; return new { SignDate, retireHistorys.Detail, retireHistorys.Id, retireHistorys.CreatedAt, Year = retireHistorys.Year.ToThaiYear().ToString().ToThaiNumber(), retireHistorys.Round, retireHistorys.Type, retireHistorys.TypeReport, Total = retireHistorys.Total.ToString().ToThaiNumber(), profile = profiles };
} }
} }
@ -194,7 +194,7 @@ namespace BMA.EHR.Application.Repositories.Reports
// }; // };
// retires.Add(data); // retires.Add(data);
// } // }
string SignDate = DateTime.Parse(retire.SignDate.ToString()).ToThaiFullDate().ToString().ToThaiNumber(); string SignDate = retire.SignDate != null ? DateTime.Parse(retire.SignDate.ToString()).ToThaiFullDate().ToString().ToThaiNumber() : "-";
return new { SignDate, retire.Detail, retire.Id, retire.CreatedAt, Year = retire.Year.ToThaiYear().ToString().ToThaiNumber(), retire.Round, retire.Type, retire.TypeReport, Total = profile_retire.Count.ToString().ToThaiNumber(), profile = profile_retire }; return new { SignDate, retire.Detail, retire.Id, retire.CreatedAt, Year = retire.Year.ToThaiYear().ToString().ToThaiNumber(), retire.Round, retire.Type, retire.TypeReport, Total = profile_retire.Count.ToString().ToThaiNumber(), profile = profile_retire };
} }
} }

4
BMA.EHR.Application/Responses/KeyValueItemResponse.cs
View file

@ -2,8 +2,8 @@
{ {
public class KeyValueItemResponse public class KeyValueItemResponse
{ {
public Guid Id { get; set; } = Guid.Empty; public Guid? Id { get; set; } = Guid.Empty;
public string Name { get; set; } = string.Empty; public string? Name { get; set; } = string.Empty;
} }
} }

4
BMA.EHR.Command.Service/appsettings.json
View file

@ -14,7 +14,7 @@
"AllowedHosts": "*", "AllowedHosts": "*",
"ConnectionStrings": { "ConnectionStrings": {
//"DefaultConnection": "User Id=sys;Password=P@ssw0rd;DBA Privilege=SYSDBA;Data Source=localhost:1521/ORCLCDB", //"DefaultConnection": "User Id=sys;Password=P@ssw0rd;DBA Privilege=SYSDBA;Data Source=localhost:1521/ORCLCDB",
"DefaultConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;" "DefaultConnection": "server=192.168.1.61;user=root;password=adminVM123;port=4061;database=bma_ehr;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;"
}, },
"Jwt": { "Jwt": {
"Key": "HP-FnQMUj9msHMSD3T9HtdEnphAKoCJLEl85CIqROFI", "Key": "HP-FnQMUj9msHMSD3T9HtdEnphAKoCJLEl85CIqROFI",
@ -42,5 +42,5 @@
"MailFrom": "saraban.csc.rd@bangkok.go.th", "MailFrom": "saraban.csc.rd@bangkok.go.th",
"Port": "25" "Port": "25"
}, },
"API": "https://bma-ehr.frappet.synology.me/api/v1" "API": "https://bma-ehr.frappet.com/api/v1"
} }

88
BMA.EHR.Placement.Service/Controllers/PlacementController.cs
View file

@ -784,54 +784,54 @@ namespace BMA.EHR.Placement.Service.Controllers
person.posLevelId = req.posLevelId; person.posLevelId = req.posLevelId;
person.posLevelName = req.posLevelName; person.posLevelName = req.posLevelName;
apiUrl = $"{_configuration["API"]}org/profile/profileid/position/{person.profileId}"; // apiUrl = $"{_configuration["API"]}org/profile/profileid/position/{person.profileId}";
using (var client = new HttpClient()) // using (var client = new HttpClient())
{ // {
client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", "")); // client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
var _req = new HttpRequestMessage(HttpMethod.Get, apiUrl); // var _req = new HttpRequestMessage(HttpMethod.Get, apiUrl);
var _res = await client.SendAsync(_req); // var _res = await client.SendAsync(_req);
var _result = await _res.Content.ReadAsStringAsync(); // var _result = await _res.Content.ReadAsStringAsync();
var org = JsonConvert.DeserializeObject<OrgRequest>(_result); // var org = JsonConvert.DeserializeObject<OrgRequest>(_result);
if (org == null || org.result == null) // if (org == null || org.result == null)
{ // {
person.IsOld = false; // person.IsOld = false;
} // }
else // else
{ // {
// person.AmountOld = org.result.xxxxxxxx; // // person.AmountOld = org.result.xxxxxxxx;
person.nodeOld = org.result.node; // person.nodeOld = org.result.node;
person.nodeIdOld = org.result.nodeId; // person.nodeIdOld = org.result.nodeId;
// person.posmasterIdOld = org.result.xxxxxxxx; // // person.posmasterIdOld = org.result.xxxxxxxx;
person.rootOld = org.result.root; // person.rootOld = org.result.root;
person.rootIdOld = org.result.rootId; // person.rootIdOld = org.result.rootId;
person.rootShortNameOld = org.result.rootShortName; // person.rootShortNameOld = org.result.rootShortName;
person.child1Old = org.result.child1; // person.child1Old = org.result.child1;
person.child1IdOld = org.result.child1Id; // person.child1IdOld = org.result.child1Id;
person.child1ShortNameOld = org.result.child1ShortName; // person.child1ShortNameOld = org.result.child1ShortName;
person.child2Old = org.result.child2; // person.child2Old = org.result.child2;
person.child2IdOld = org.result.child2Id; // person.child2IdOld = org.result.child2Id;
person.child2ShortNameOld = org.result.child2ShortName; // person.child2ShortNameOld = org.result.child2ShortName;
person.child3Old = org.result.child3; // person.child3Old = org.result.child3;
person.child3IdOld = org.result.child3Id; // person.child3IdOld = org.result.child3Id;
person.child3ShortNameOld = org.result.child3ShortName; // person.child3ShortNameOld = org.result.child3ShortName;
person.child4Old = org.result.child4; // person.child4Old = org.result.child4;
person.child4IdOld = org.result.child4Id; // person.child4IdOld = org.result.child4Id;
person.child4ShortNameOld = org.result.child4ShortName; // person.child4ShortNameOld = org.result.child4ShortName;
// person.orgRevisionIdOld = org.result.xxxxxxx; // // person.orgRevisionIdOld = org.result.xxxxxxx;
// person.positionIdOld = org.result.xxxxxxx; // // person.positionIdOld = org.result.xxxxxxx;
person.posMasterNoOld = org.result.posMasterNo; // person.posMasterNoOld = org.result.posMasterNo;
person.positionNameOld = org.result.position; // person.positionNameOld = org.result.position;
// person.positionFieldOld = org.result.xxxxxxx; // // person.positionFieldOld = org.result.xxxxxxx;
person.posTypeIdOld = org.result.posTypeId; // person.posTypeIdOld = org.result.posTypeId;
person.posTypeNameOld = org.result.posTypeName; // person.posTypeNameOld = org.result.posTypeName;
person.posLevelIdOld = org.result.posLevelId; // person.posLevelIdOld = org.result.posLevelId;
person.posLevelNameOld = org.result.posLevelName; // person.posLevelNameOld = org.result.posLevelName;
} // }
} // }
person.PlacementStatus = "PREPARE-CONTAIN"; person.PlacementStatus = "PREPARE-CONTAIN";
person.LastUpdateFullName = FullName ?? "System Administrator"; person.LastUpdateFullName = FullName ?? "System Administrator";

6
BMA.EHR.Retirement.Service/Controllers/RetirementController.cs
View file

@ -958,7 +958,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
} }
else else
{ {
var apiUrl = $"{_configuration["API"]}org/profile/profileid/position/{req.ProfileId}"; var apiUrl = $"{_configuration["API"]}org/profile-employee/profileid/position/{req.ProfileId}";
using (var client = new HttpClient()) using (var client = new HttpClient())
{ {
var data = new RetirementProfile var data = new RetirementProfile
@ -1012,8 +1012,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
data.posLevelId = org.result.posLevelId; data.posLevelId = org.result.posLevelId;
data.posLevelName = org.result.posLevelName; data.posLevelName = org.result.posLevelName;
data.posLevelRank = org.result.posLevelRank; data.posLevelRank = org.result.posLevelRank;
data.posExecutiveId = org.result.posExecutiveId; //data.posExecutiveId = org.result.posExecutiveId;
data.posExecutiveName = org.result.posExecutiveName; //data.posExecutiveName = org.result.posExecutiveName;
data.posNo = org.result.posNo; data.posNo = org.result.posNo;
_context.RetirementProfiles.Add(data); _context.RetirementProfiles.Add(data);