update (positionExecutiveField)
This commit is contained in:
parent
706edbd0f0
commit
bc8b681900
8 changed files with 26 additions and 10 deletions
|
|
@ -2,6 +2,7 @@
|
|||
using BMA.EHR.Application.Repositories.MessageQueue;
|
||||
using BMA.EHR.Domain.Common;
|
||||
using BMA.EHR.Domain.Extensions;
|
||||
using BMA.EHR.Domain.Models.Placement;
|
||||
using BMA.EHR.Domain.Models.Retirement;
|
||||
using BMA.EHR.Domain.Shared;
|
||||
using BMA.EHR.Infrastructure.Persistence;
|
||||
|
|
@ -310,7 +311,9 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
(org.result.child2 == null ? "" : org.result.child2 + "\n") +
|
||||
(org.result.child1 == null ? "" : org.result.child1 + "\n") +
|
||||
(org.result.root == null ? "" : org.result.root);
|
||||
retirementOut.OrganizationPositionOld = org.result.position + "\n" + (retirementOut.PositionExecutiveOld == null ? "" : retirementOut.PositionExecutiveOld + "\n") + retirementOut.OrganizationOld;
|
||||
retirementOut.OrganizationPositionOld = org.result.position + "\n" +
|
||||
(retirementOut.PositionExecutiveOld == null ? "" : (retirementOut.positionExecutiveField == null ? retirementOut.PositionExecutiveOld + "\n" : retirementOut.PositionExecutiveOld + "(" + retirementOut.positionExecutiveField + ")" + "\n"))
|
||||
+ retirementOut.OrganizationOld;
|
||||
retirementOut.AmountOld = org.result.salary;
|
||||
}
|
||||
}
|
||||
|
|
@ -324,9 +327,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
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);
|
||||
|
||||
if (org == null || org.result == null)
|
||||
return Error("ไม่พบหน่วยงานของผู้ใช้งานคนนี้", 404);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue