This commit is contained in:
parent
c9ed721cc0
commit
c16f364b8a
6 changed files with 20885 additions and 80 deletions
|
|
@ -112,6 +112,36 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
p.prefix,
|
||||
p.firstName,
|
||||
p.lastName,
|
||||
p.root,
|
||||
p.rootId,
|
||||
p.rootShortName,
|
||||
p.child1,
|
||||
p.child1Id,
|
||||
p.child1ShortName,
|
||||
p.child2,
|
||||
p.child2Id,
|
||||
p.child2ShortName,
|
||||
p.child3,
|
||||
p.child3Id,
|
||||
p.child3ShortName,
|
||||
p.child4,
|
||||
p.child4Id,
|
||||
p.child4ShortName,
|
||||
p.orgRevisionId,
|
||||
p.positionId,
|
||||
p.posMasterNo,
|
||||
p.position,
|
||||
p.PositionExecutive,
|
||||
p.positionField,
|
||||
p.posTypeId,
|
||||
p.posTypeName,
|
||||
p.posLevelId,
|
||||
p.posLevelName,
|
||||
node = p.root == null ? (int?)null : (p.child1 == null ? 0 : (p.child2 == null ? 1 : (p.child3 == null ? 2 : (p.child4 == null ? 3 : 4)))),
|
||||
nodeName = p.root == null ? null : (p.child1 == null ? p.root : (p.child2 == null ? p.child1 : (p.child3 == null ? p.child2 : (p.child4 == null ? p.child3 : p.child4)))),
|
||||
nodeId = p.rootId == null ? null : (p.child1Id == null ? p.rootId : (p.child2Id == null ? p.child1Id : (p.child3Id == null ? p.child2Id : (p.child4Id == null ? p.child3Id : p.child4Id)))),
|
||||
nodeShortName = p.rootShortName == null ? null : (p.child1ShortName == null ? p.rootShortName : (p.child2ShortName == null ? p.child1ShortName : (p.child3ShortName == null ? p.child2ShortName : (p.child4ShortName == null ? p.child3ShortName : p.child4ShortName)))),
|
||||
|
||||
p.rootOld,
|
||||
p.rootOldId,
|
||||
p.rootShortNameOld,
|
||||
|
|
@ -134,7 +164,11 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
p.posTypeNameOld,
|
||||
p.posLevelOldId,
|
||||
p.posLevelNameOld,
|
||||
|
||||
p.Status,
|
||||
p.Amount,
|
||||
p.ReportingDate,
|
||||
|
||||
p.CreatedAt,
|
||||
p.Reason,
|
||||
p.MilitaryDate,
|
||||
|
|
@ -144,6 +178,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
p.PositionLevelOld,
|
||||
p.PositionNumberOld,
|
||||
p.OrganizationPositionOld,
|
||||
p.posmasterId,
|
||||
p.PositionDate,
|
||||
CommandType = p.CommandType == null ? null : p.CommandType.Name,
|
||||
})
|
||||
|
|
@ -204,6 +239,36 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
p.prefix,
|
||||
p.firstName,
|
||||
p.lastName,
|
||||
p.root,
|
||||
p.rootId,
|
||||
p.rootShortName,
|
||||
p.child1,
|
||||
p.child1Id,
|
||||
p.child1ShortName,
|
||||
p.child2,
|
||||
p.child2Id,
|
||||
p.child2ShortName,
|
||||
p.child3,
|
||||
p.child3Id,
|
||||
p.child3ShortName,
|
||||
p.child4,
|
||||
p.child4Id,
|
||||
p.child4ShortName,
|
||||
node = p.root == null ? (int?)null : (p.child1 == null ? 0 : (p.child2 == null ? 1 : (p.child3 == null ? 2 : (p.child4 == null ? 3 : 4)))),
|
||||
nodeName = p.root == null ? null : (p.child1 == null ? p.root : (p.child2 == null ? p.child1 : (p.child3 == null ? p.child2 : (p.child4 == null ? p.child3 : p.child4)))),
|
||||
nodeId = p.rootId == null ? null : (p.child1Id == null ? p.rootId : (p.child2Id == null ? p.child1Id : (p.child3Id == null ? p.child2Id : (p.child4Id == null ? p.child3Id : p.child4Id)))),
|
||||
nodeShortName = p.rootShortName == null ? null : (p.child1ShortName == null ? p.rootShortName : (p.child2ShortName == null ? p.child1ShortName : (p.child3ShortName == null ? p.child2ShortName : (p.child4ShortName == null ? p.child3ShortName : p.child4ShortName)))),
|
||||
p.orgRevisionId,
|
||||
p.positionId,
|
||||
p.posMasterNo,
|
||||
p.position,
|
||||
p.PositionExecutive,
|
||||
p.positionField,
|
||||
p.posTypeId,
|
||||
p.posTypeName,
|
||||
p.posLevelId,
|
||||
p.posLevelName,
|
||||
|
||||
p.rootOld,
|
||||
p.rootOldId,
|
||||
p.rootShortNameOld,
|
||||
|
|
@ -219,12 +284,20 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
p.child4Old,
|
||||
p.child4OldId,
|
||||
p.child4ShortNameOld,
|
||||
nodeOld = p.rootOld == null ? (int?)null : (p.child1Old == null ? 0 : (p.child2Old == null ? 1 : (p.child3Old == null ? 2 : (p.child4Old == null ? 3 : 4)))),
|
||||
nodeNameOld = p.rootOld == null ? null : (p.child1Old == null ? p.root : (p.child2Old == null ? p.child1Old : (p.child3Old == null ? p.child2Old : (p.child4Old == null ? p.child3Old : p.child4Old)))),
|
||||
nodeOldId = p.rootOldId == null ? null : (p.child1OldId == null ? p.rootOldId : (p.child2OldId == null ? p.child1OldId : (p.child3OldId == null ? p.child2OldId : (p.child4OldId == null ? p.child3OldId : p.child4OldId)))),
|
||||
nodeShortNameOld = p.rootShortNameOld == null ? null : (p.child1ShortNameOld == null ? p.rootShortNameOld : (p.child2ShortNameOld == null ? p.child1ShortNameOld : (p.child3ShortNameOld == null ? p.child2ShortNameOld : (p.child4ShortNameOld == null ? p.child3ShortNameOld : p.child4ShortNameOld)))),
|
||||
p.posMasterNoOld,
|
||||
p.posTypeOldId,
|
||||
p.posTypeNameOld,
|
||||
p.posLevelOldId,
|
||||
p.posLevelNameOld,
|
||||
|
||||
p.Status,
|
||||
p.Amount,
|
||||
p.ReportingDate,
|
||||
|
||||
p.CreatedAt,
|
||||
p.Reason,
|
||||
p.MilitaryDate,
|
||||
|
|
@ -238,6 +311,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
p.PositionExecutiveOld,
|
||||
p.OrganizationOld,
|
||||
p.PositionDate,
|
||||
p.posmasterId,
|
||||
CommandType = p.CommandType == null ? null : p.CommandType.Name,
|
||||
})
|
||||
.FirstOrDefaultAsync();
|
||||
|
|
@ -368,84 +442,97 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
return Success();
|
||||
}
|
||||
|
||||
// /// <summary>
|
||||
// /// เลือกหน่วยงาน
|
||||
// /// </summary>
|
||||
// /// <param name="id">Id อื่นๆ</param>
|
||||
// /// <returns></returns>
|
||||
// /// <response code="200"></response>
|
||||
// /// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
|
||||
// /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
|
||||
// /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
|
||||
// [HttpPut("position/{id:length(36)}")]
|
||||
// public async Task<ActionResult<ResponseObject>> UpdatePositionRetirementOther([FromBody] PersonSelectPositionOtherRequest req, Guid id)
|
||||
// {
|
||||
// var uppdated = await _context.RetirementOthers
|
||||
// .FirstOrDefaultAsync(x => x.Id == id);
|
||||
// if (uppdated == null)
|
||||
// return Error(GlobalMessages.RetirementOtherNotFound, 404);
|
||||
// if (req.PosNoId != null)
|
||||
// {
|
||||
// var save_posNo = await _context.PositionNumbers.FindAsync(req.PosNoId);
|
||||
// if (save_posNo == null)
|
||||
// return Error(GlobalMessages.PositionPosNoNotFound, 404);
|
||||
// uppdated.PositionNumber = save_posNo;
|
||||
/// <summary>
|
||||
/// เลือกหน่วยงาน
|
||||
/// </summary>
|
||||
/// <param name="id">Id อื่นๆ</param>
|
||||
/// <returns></returns>
|
||||
/// <response code="200"></response>
|
||||
/// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
|
||||
/// <response code="401">ไม่ได้ Login เข้าระบบ</response>
|
||||
/// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
|
||||
[HttpPut("position/{id:length(36)}")]
|
||||
public async Task<ActionResult<ResponseObject>> UpdatePositionRetirementOther([FromBody] PersonSelectPositionOtherRequest req, Guid id)
|
||||
{
|
||||
var uppdated = await _context.RetirementOthers
|
||||
.FirstOrDefaultAsync(x => x.Id == id);
|
||||
if (uppdated == null)
|
||||
return Error(GlobalMessages.RetirementOtherNotFound, 404);
|
||||
|
||||
var apiUrl = $"{_configuration["API"]}/org/find/all";
|
||||
|
||||
// var save_orgPosition = await _context.OrganizationPositions.FirstOrDefaultAsync(x => x.PositionNumber == save_posNo);
|
||||
// if (save_orgPosition == null)
|
||||
// return Error(GlobalMessages.PositionPosNoNotFound, 404);
|
||||
// uppdated.OrganizationPosition = save_orgPosition;
|
||||
// }
|
||||
using (var client = new HttpClient())
|
||||
{
|
||||
client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
|
||||
client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
|
||||
var _req = new HttpRequestMessage(HttpMethod.Post, apiUrl);
|
||||
var _res = await client.PostAsJsonAsync(apiUrl, new
|
||||
{
|
||||
node = req.node,
|
||||
nodeId = req.nodeId,
|
||||
});
|
||||
var _result = await _res.Content.ReadAsStringAsync();
|
||||
var org = JsonConvert.DeserializeObject<OrgRequest>(_result);
|
||||
|
||||
// if (req.PositionId != null)
|
||||
// {
|
||||
// var save = await _context.PositionPaths.FindAsync(req.PositionId);
|
||||
// if (save == null)
|
||||
// return Error(GlobalMessages.PositionPathNotFound, 404);
|
||||
// uppdated.PositionPath = save;
|
||||
// }
|
||||
if (org == null || org.result == null)
|
||||
return Error("ไม่พบหน่วยงานนี้ในระบบ", 404);
|
||||
uppdated.root = org.result.root;
|
||||
uppdated.rootId = org.result.rootId;
|
||||
uppdated.rootDnaId = org.result.rootDnaId;
|
||||
uppdated.rootShortName = org.result.rootShortName;
|
||||
uppdated.child1 = req.node <= 0 ? null : org.result.child1;
|
||||
uppdated.child1Id = req.node <= 0 ? null : org.result.child1Id;
|
||||
uppdated.child1DnaId = req.node <= 0 ? null : org.result.child1DnaId;
|
||||
uppdated.child1ShortName = req.node <= 0 ? null : org.result.child1ShortName;
|
||||
uppdated.child2 = req.node <= 1 ? null : org.result.child2;
|
||||
uppdated.child2Id = req.node <= 1 ? null : org.result.child2Id;
|
||||
uppdated.child2DnaId = req.node <= 1 ? null : org.result.child2DnaId;
|
||||
uppdated.child2ShortName = req.node <= 1 ? null : org.result.child2ShortName;
|
||||
uppdated.child3 = req.node <= 2 ? null : org.result.child3;
|
||||
uppdated.child3Id = req.node <= 2 ? null : org.result.child3Id;
|
||||
uppdated.child3DnaId = req.node <= 2 ? null : org.result.child3DnaId;
|
||||
uppdated.child3ShortName = req.node <= 2 ? null : org.result.child3ShortName;
|
||||
uppdated.child4 = req.node <= 3 ? null : org.result.child4;
|
||||
uppdated.child4Id = req.node <= 3 ? null : org.result.child4Id;
|
||||
uppdated.child4DnaId = req.node <= 3 ? null : org.result.child4DnaId;
|
||||
uppdated.child4ShortName = req.node <= 3 ? null : org.result.child4ShortName;
|
||||
}
|
||||
|
||||
// if (req.PositionLevelId != null)
|
||||
// {
|
||||
// var save = await _context.PositionLevels.FindAsync(req.PositionLevelId);
|
||||
// if (save == null)
|
||||
// return Error(GlobalMessages.PositionLevelNotFound, 404);
|
||||
// uppdated.PositionLevel = save;
|
||||
// }
|
||||
var apiUrlUpdate = $"{_configuration["API"]}/org/pos/officer/master-old/book";
|
||||
using (var client = new HttpClient())
|
||||
{
|
||||
client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
|
||||
client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
|
||||
var _resUpdate = await client.PostAsJsonAsync(apiUrlUpdate, new
|
||||
{
|
||||
posMasterOldId = uppdated.posmasterId,
|
||||
posMasterId = req.posmasterId,
|
||||
profileId = uppdated.profileId,
|
||||
});
|
||||
}
|
||||
uppdated.posmasterId = req.posmasterId;
|
||||
uppdated.node = req.node;
|
||||
uppdated.nodeId = req.nodeId;
|
||||
uppdated.orgRevisionId = req.orgRevisionId;
|
||||
uppdated.positionId = req.positionId;
|
||||
uppdated.posMasterNo = req.posMasterNo;
|
||||
uppdated.position = req.positionName;
|
||||
uppdated.PositionExecutive = req.posExecutiveName;
|
||||
uppdated.positionField = req.positionField;
|
||||
uppdated.posTypeId = req.posTypeId;
|
||||
uppdated.posTypeName = req.posTypeName;
|
||||
uppdated.posLevelId = req.posLevelId;
|
||||
uppdated.posLevelName = req.posLevelName;
|
||||
uppdated.Amount = req.Amount;
|
||||
uppdated.ReportingDate = req.reportingDate;
|
||||
uppdated.Status = "PENDING";
|
||||
uppdated.LastUpdateFullName = FullName ?? "System Administrator";
|
||||
uppdated.LastUpdateUserId = UserId ?? "";
|
||||
uppdated.LastUpdatedAt = DateTime.Now;
|
||||
await _context.SaveChangesAsync();
|
||||
|
||||
// if (req.PositionLineId != null)
|
||||
// {
|
||||
// var save = await _context.PositionLines.FindAsync(req.PositionLineId);
|
||||
// if (save == null)
|
||||
// return Error(GlobalMessages.PositionLineNotFound, 404);
|
||||
// uppdated.PositionLine = save;
|
||||
// }
|
||||
|
||||
// if (req.PositionPathSideId != null)
|
||||
// {
|
||||
// var save = await _context.PositionPathSides.FindAsync(req.PositionPathSideId);
|
||||
// if (save == null)
|
||||
// return Error(GlobalMessages.PositionPathSideNotFound, 404);
|
||||
// uppdated.PositionPathSide = save;
|
||||
// }
|
||||
|
||||
// if (req.PositionTypeId != null)
|
||||
// {
|
||||
// var save = await _context.PositionTypes.FindAsync(req.PositionTypeId);
|
||||
// if (save == null)
|
||||
// return Error(GlobalMessages.PositionTypeNotFound, 404);
|
||||
// uppdated.PositionType = save;
|
||||
// }
|
||||
|
||||
// uppdated.RecruitDate = req.RecruitDate;
|
||||
// uppdated.Status = "PENDING";
|
||||
// uppdated.LastUpdateFullName = FullName ?? "System Administrator";
|
||||
// uppdated.LastUpdateUserId = UserId ?? "";
|
||||
// uppdated.LastUpdatedAt = DateTime.Now;
|
||||
// await _context.SaveChangesAsync();
|
||||
|
||||
// return Success();
|
||||
// }
|
||||
return Success();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// แก้ไขอื่นๆ
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue