no message
This commit is contained in:
Kittapath
parent
2678b7fc59
commit
6554971c3c
4 changed files with 87 additions and 83 deletions
|
|
@ -239,6 +239,7 @@ namespace BMA.EHR.Application.Repositories.Commands
|
|||
.Where(x => x.PlacementStatus.Trim().ToUpper() == "PREPARE-CONTAIN")
|
||||
.Where(x => x.Draft! == true)
|
||||
.Where(x => x.Placement!.PlacementType!.Name == "สอบแข่งขัน")
|
||||
.Where(x => x.typeCommand.Trim().ToUpper() == "APPOINTED")
|
||||
.OrderBy(x => x.ExamNumber)
|
||||
.ToListAsync();
|
||||
|
||||
|
|
@ -297,6 +298,7 @@ namespace BMA.EHR.Application.Repositories.Commands
|
|||
.Where(x => x.PlacementStatus.Trim().ToUpper() == "PREPARE-CONTAIN")
|
||||
.Where(x => x.Draft! == true)
|
||||
.Where(x => x.Placement!.PlacementType!.Name != "สอบแข่งขัน")
|
||||
.Where(x => x.typeCommand.Trim().ToUpper() == "APPOINTED")
|
||||
.OrderBy(x => x.ExamNumber)
|
||||
.ToListAsync();
|
||||
|
||||
|
|
@ -354,6 +356,7 @@ namespace BMA.EHR.Application.Repositories.Commands
|
|||
.Where(x => x.Placement.Id == command.Placement.Id)
|
||||
.Where(x => !otherCommandReceivers.Contains(x.CitizenId!))
|
||||
.Where(x => x.PlacementStatus.Trim().ToUpper() == "PREPARE-CONTAIN")
|
||||
.Where(x => x.typeCommand.Trim().ToUpper() == "APPOINT")
|
||||
.Where(x => x.Draft! == true)
|
||||
.OrderBy(x => x.ExamNumber)
|
||||
.ToListAsync();
|
||||
|
|
@ -412,6 +415,7 @@ namespace BMA.EHR.Application.Repositories.Commands
|
|||
.Where(x => x.Placement.Id == command.Placement.Id)
|
||||
.Where(x => !otherCommandReceivers.Contains(x.CitizenId!))
|
||||
.Where(x => x.PlacementStatus.Trim().ToUpper() == "PREPARE-CONTAIN")
|
||||
.Where(x => x.typeCommand.Trim().ToUpper() == "MOVE")
|
||||
.Where(x => x.Draft! == true)
|
||||
.OrderBy(x => x.ExamNumber)
|
||||
.ToListAsync();
|
||||
|
|
@ -9156,8 +9160,8 @@ namespace BMA.EHR.Application.Repositories.Commands
|
|||
{
|
||||
ret.Add(new KeyValueItemResponse
|
||||
{
|
||||
Id = raw.result!.rootId,
|
||||
Name = raw.result!.root,
|
||||
Id = raw.result!.rootId??null,
|
||||
Name = raw.result!.root??null,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
@ -9794,39 +9798,39 @@ namespace BMA.EHR.Application.Repositories.Commands
|
|||
// }
|
||||
// }
|
||||
|
||||
// var Insignias = await _dbContext.Set<ProfileInsignia>()
|
||||
// .Include(x => x.Insignia)
|
||||
// .Where(x => orgIdSend.Contains(x.ProfileId))
|
||||
// .ToListAsync();
|
||||
// if (Insignias.Count > 0)
|
||||
// {
|
||||
// var apiUrlInsig = $"{_baseAPI}/org/dotnet/insignia/Dumb";
|
||||
// using (var client = new HttpClient())
|
||||
// {
|
||||
// client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
|
||||
// foreach (var insignia in Insignias)
|
||||
// {
|
||||
// var _res = await client.PostAsJsonAsync(apiUrlInsig, new
|
||||
// {
|
||||
// profileId = profile.Id,
|
||||
// year = insignia.Year,
|
||||
// no = insignia.No,
|
||||
// volume = insignia.Volume,
|
||||
// section = insignia.Section,
|
||||
// page = insignia.Page,
|
||||
// receiveDate = insignia.ReceiveDate,
|
||||
// insigniaId = insignia.Insignia.Id, //where in node
|
||||
// dateAnnounce = insignia.DateAnnounce,
|
||||
// issue = insignia.Issue,
|
||||
// volumeNo = insignia.VolumeNo,
|
||||
// refCommandDate = insignia.RefCommandDate,
|
||||
// refCommandNo = insignia.RefCommandNo,
|
||||
// note = insignia.Note,
|
||||
// });
|
||||
// var _result = await _res.Content.ReadAsStringAsync();
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
var Insignias = await _dbContext.Set<ProfileInsignia>()
|
||||
.Include(x => x.Insignia)
|
||||
.Where(x => profile.Id==x.ProfileId)
|
||||
.ToListAsync();
|
||||
if (Insignias.Count > 0)
|
||||
{
|
||||
var apiUrlInsig = $"{_baseAPI}/org/dotnet/insignia/Dumb";
|
||||
using (var client = new HttpClient())
|
||||
{
|
||||
client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
|
||||
foreach (var insignia in Insignias)
|
||||
{
|
||||
var _res = await client.PostAsJsonAsync(apiUrlInsig, new
|
||||
{
|
||||
profileId = profile.Id,
|
||||
year = insignia.Year,
|
||||
no = insignia.No,
|
||||
volume = insignia.Volume,
|
||||
section = insignia.Section,
|
||||
page = insignia.Page,
|
||||
receiveDate = insignia.ReceiveDate,
|
||||
insigniaId = insignia.Insignia.Id, //where in node
|
||||
dateAnnounce = insignia.DateAnnounce,
|
||||
issue = insignia.Issue,
|
||||
volumeNo = insignia.VolumeNo,
|
||||
refCommandDate = insignia.RefCommandDate,
|
||||
refCommandNo = insignia.RefCommandNo,
|
||||
note = insignia.Note,
|
||||
});
|
||||
var _result = await _res.Content.ReadAsStringAsync();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// var Honor = await _dbContext.Set<ProfileHonor>()
|
||||
// .Where(x => orgIdSend.Contains(x.ProfileId))
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
{
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
"AllowedHosts": "*",
|
||||
"ConnectionStrings": {
|
||||
//"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": {
|
||||
"Key": "HP-FnQMUj9msHMSD3T9HtdEnphAKoCJLEl85CIqROFI",
|
||||
|
|
@ -42,5 +42,5 @@
|
|||
"MailFrom": "saraban.csc.rd@bangkok.go.th",
|
||||
"Port": "25"
|
||||
},
|
||||
"API": "https://bma-ehr.frappet.synology.me/api/v1"
|
||||
"API": "https://bma-ehr.frappet.com/api/v1"
|
||||
}
|
||||
|
|
@ -784,54 +784,54 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
person.posLevelId = req.posLevelId;
|
||||
person.posLevelName = req.posLevelName;
|
||||
|
||||
apiUrl = $"{_configuration["API"]}org/profile/profileid/position/{person.profileId}";
|
||||
using (var client = new HttpClient())
|
||||
{
|
||||
client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
|
||||
var _req = new HttpRequestMessage(HttpMethod.Get, apiUrl);
|
||||
var _res = await client.SendAsync(_req);
|
||||
var _result = await _res.Content.ReadAsStringAsync();
|
||||
// apiUrl = $"{_configuration["API"]}org/profile/profileid/position/{person.profileId}";
|
||||
// using (var client = new HttpClient())
|
||||
// {
|
||||
// client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
|
||||
// var _req = new HttpRequestMessage(HttpMethod.Get, apiUrl);
|
||||
// var _res = await client.SendAsync(_req);
|
||||
// var _result = await _res.Content.ReadAsStringAsync();
|
||||
|
||||
var org = JsonConvert.DeserializeObject<OrgRequest>(_result);
|
||||
// var org = JsonConvert.DeserializeObject<OrgRequest>(_result);
|
||||
|
||||
if (org == null || org.result == null)
|
||||
{
|
||||
person.IsOld = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
// if (org == null || org.result == null)
|
||||
// {
|
||||
// person.IsOld = false;
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
|
||||
// person.AmountOld = org.result.xxxxxxxx;
|
||||
person.nodeOld = org.result.node;
|
||||
person.nodeIdOld = org.result.nodeId;
|
||||
// person.posmasterIdOld = org.result.xxxxxxxx;
|
||||
// // person.AmountOld = org.result.xxxxxxxx;
|
||||
// person.nodeOld = org.result.node;
|
||||
// person.nodeIdOld = org.result.nodeId;
|
||||
// // person.posmasterIdOld = org.result.xxxxxxxx;
|
||||
|
||||
person.rootOld = org.result.root;
|
||||
person.rootIdOld = org.result.rootId;
|
||||
person.rootShortNameOld = org.result.rootShortName;
|
||||
person.child1Old = org.result.child1;
|
||||
person.child1IdOld = org.result.child1Id;
|
||||
person.child1ShortNameOld = org.result.child1ShortName;
|
||||
person.child2Old = org.result.child2;
|
||||
person.child2IdOld = org.result.child2Id;
|
||||
person.child2ShortNameOld = org.result.child2ShortName;
|
||||
person.child3Old = org.result.child3;
|
||||
person.child3IdOld = org.result.child3Id;
|
||||
person.child3ShortNameOld = org.result.child3ShortName;
|
||||
person.child4Old = org.result.child4;
|
||||
person.child4IdOld = org.result.child4Id;
|
||||
person.child4ShortNameOld = org.result.child4ShortName;
|
||||
// person.orgRevisionIdOld = org.result.xxxxxxx;
|
||||
// person.positionIdOld = org.result.xxxxxxx;
|
||||
person.posMasterNoOld = org.result.posMasterNo;
|
||||
person.positionNameOld = org.result.position;
|
||||
// person.positionFieldOld = org.result.xxxxxxx;
|
||||
person.posTypeIdOld = org.result.posTypeId;
|
||||
person.posTypeNameOld = org.result.posTypeName;
|
||||
person.posLevelIdOld = org.result.posLevelId;
|
||||
person.posLevelNameOld = org.result.posLevelName;
|
||||
}
|
||||
}
|
||||
// person.rootOld = org.result.root;
|
||||
// person.rootIdOld = org.result.rootId;
|
||||
// person.rootShortNameOld = org.result.rootShortName;
|
||||
// person.child1Old = org.result.child1;
|
||||
// person.child1IdOld = org.result.child1Id;
|
||||
// person.child1ShortNameOld = org.result.child1ShortName;
|
||||
// person.child2Old = org.result.child2;
|
||||
// person.child2IdOld = org.result.child2Id;
|
||||
// person.child2ShortNameOld = org.result.child2ShortName;
|
||||
// person.child3Old = org.result.child3;
|
||||
// person.child3IdOld = org.result.child3Id;
|
||||
// person.child3ShortNameOld = org.result.child3ShortName;
|
||||
// person.child4Old = org.result.child4;
|
||||
// person.child4IdOld = org.result.child4Id;
|
||||
// person.child4ShortNameOld = org.result.child4ShortName;
|
||||
// // person.orgRevisionIdOld = org.result.xxxxxxx;
|
||||
// // person.positionIdOld = org.result.xxxxxxx;
|
||||
// person.posMasterNoOld = org.result.posMasterNo;
|
||||
// person.positionNameOld = org.result.position;
|
||||
// // person.positionFieldOld = org.result.xxxxxxx;
|
||||
// person.posTypeIdOld = org.result.posTypeId;
|
||||
// person.posTypeNameOld = org.result.posTypeName;
|
||||
// person.posLevelIdOld = org.result.posLevelId;
|
||||
// person.posLevelNameOld = org.result.posLevelName;
|
||||
// }
|
||||
// }
|
||||
|
||||
person.PlacementStatus = "PREPARE-CONTAIN";
|
||||
person.LastUpdateFullName = FullName ?? "System Administrator";
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue