checkpoint #852 (1,2)
This commit is contained in:
parent
564a23988d
commit
b636233bfd
3 changed files with 314 additions and 100 deletions
|
|
@ -94,7 +94,7 @@ namespace BMA.EHR.Insignia.Service.Controllers
|
|||
return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
|
||||
}
|
||||
|
||||
var data = await _repository.GetCoinReport(req.roundId);
|
||||
var data = await _repository.GetCoinReport(req.roundId, type, req.node, req.nodeId);
|
||||
var yearInsignalPeriod = await _repository.GetYearInsigniaPeriod(req.roundId);
|
||||
|
||||
var dataResult = new List<dynamic>();
|
||||
|
|
@ -161,9 +161,13 @@ namespace BMA.EHR.Insignia.Service.Controllers
|
|||
{
|
||||
row = mergeList.Count + 1,
|
||||
ColLeft = colLeft.ToString().ToThaiNumber(),
|
||||
NameLeft = left.ElementAt(i).GetType().GetProperty("FullName").GetValue(left.ElementAt(i)),
|
||||
NameLeft = string.IsNullOrEmpty(left.ElementAt(i).GetType().GetProperty("FullName").GetValue(left.ElementAt(i))?.ToString())
|
||||
? null
|
||||
: left.ElementAt(i).GetType().GetProperty("FullName").GetValue(left.ElementAt(i)),
|
||||
ColRight = colRight.ToString().ToThaiNumber(),
|
||||
NameRight = right.ElementAt(i).GetType().GetProperty("FullName").GetValue(right.ElementAt(i)),
|
||||
NameRight = string.IsNullOrEmpty(right.ElementAt(i).GetType().GetProperty("FullName").GetValue(right.ElementAt(i))?.ToString())
|
||||
? null
|
||||
: right.ElementAt(i).GetType().GetProperty("FullName").GetValue(right.ElementAt(i)),
|
||||
InsigniaInitial = left.ElementAt(i).GetType().GetProperty("InsigniaInitial").GetValue(left.ElementAt(i)),
|
||||
InsigniaName = left.ElementAt(i).GetType().GetProperty("InsigniaName").GetValue(left.ElementAt(i)),
|
||||
Range = range.ToThaiNumber(),
|
||||
|
|
@ -200,9 +204,9 @@ namespace BMA.EHR.Insignia.Service.Controllers
|
|||
}
|
||||
#endregion
|
||||
|
||||
#region บัญชีแสดงจำนวนชั้นตราเครื่องราชฯ
|
||||
#region บัญชีระดับผลการประเมินผลการปฏิบัติราชการในรอบ 5 ปี
|
||||
/// <summary>
|
||||
/// บัญชีแสดงจำนวนชั้นตราเครื่องราชฯ
|
||||
/// บัญชีระดับผลการประเมินผลการปฏิบัติราชการในรอบ 5 ปี
|
||||
/// </summary>
|
||||
/// <param name="type">type </param>
|
||||
/// <returns></returns>
|
||||
|
|
@ -210,7 +214,7 @@ namespace BMA.EHR.Insignia.Service.Controllers
|
|||
/// <response code="401">ไม่ได้ Login เข้าระบบ</response>
|
||||
/// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
|
||||
[HttpPost("report2/{type}")]
|
||||
public async Task<ActionResult<ResponseObject>> GetInsigniaReport2Async([FromBody] GetInsigniaDetailByNodeReportDto req, string type)
|
||||
public async Task<ActionResult<ResponseObject>> GetInsigniaReport3Async([FromBody] GetInsigniaDetailByNodeReportDto req, string type)
|
||||
{
|
||||
try
|
||||
{
|
||||
|
|
@ -220,7 +224,49 @@ namespace BMA.EHR.Insignia.Service.Controllers
|
|||
{
|
||||
return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
|
||||
}
|
||||
var data = await _repository.GetSummaryCoinReport(req.roundId);
|
||||
|
||||
var data = await _repository.GetEvaluationResultReport(req.roundId, type, req.node, req.nodeId);
|
||||
|
||||
var result = new
|
||||
{
|
||||
template = "reportInsignia2",
|
||||
reportName = "reportInsignia2",
|
||||
data = new
|
||||
{
|
||||
data = data,
|
||||
}
|
||||
};
|
||||
return Success(result);
|
||||
|
||||
}
|
||||
catch
|
||||
{
|
||||
throw;
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region บัญชีแสดงจำนวนชั้นตราเครื่องราชฯ
|
||||
/// <summary>
|
||||
/// บัญชีแสดงจำนวนชั้นตราเครื่องราชฯ
|
||||
/// </summary>
|
||||
/// <param name="type">type </param>
|
||||
/// <returns></returns>
|
||||
/// <response code="200">เมื่อทำการอ่านข้อมูลจาก Relational Database สำเร็จ</response>
|
||||
/// <response code="401">ไม่ได้ Login เข้าระบบ</response>
|
||||
/// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
|
||||
[HttpPost("report3/{type}")]
|
||||
public async Task<ActionResult<ResponseObject>> GetInsigniaReport2Async([FromBody] GetInsigniaDetailByNodeReportDto req, string type)
|
||||
{
|
||||
try
|
||||
{
|
||||
/* var getPermission = await _permission.GetPermissionAPIAsync("GET", "SYS_INSIGNIA_REPORT");
|
||||
var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
|
||||
if (jsonData["status"]?.ToString() != "200")
|
||||
{
|
||||
return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
|
||||
}*/
|
||||
var data = await _repository.GetSummaryCoinReport(req.roundId, type, req.node, req.nodeId);
|
||||
var summaryTotal = await _repository.GetSummaryTotalCoinReport(req.roundId);
|
||||
var yearInsignalPeriod = await _repository.GetYearInsigniaPeriod(req.roundId);
|
||||
|
||||
|
|
@ -242,8 +288,8 @@ namespace BMA.EHR.Insignia.Service.Controllers
|
|||
|
||||
var result = new
|
||||
{
|
||||
template = "reportInsignia2",
|
||||
reportName = "reportInsignia2",
|
||||
template = "reportInsignia3",
|
||||
reportName = "reportInsignia3",
|
||||
data = new
|
||||
{
|
||||
yearInsignalPeriod,
|
||||
|
|
@ -261,44 +307,6 @@ namespace BMA.EHR.Insignia.Service.Controllers
|
|||
}
|
||||
#endregion
|
||||
|
||||
#region บัญชีระดับผลการประเมินผลการปฏิบัติราชการในรอบ 5 ปี
|
||||
/// <summary>
|
||||
/// บัญชีระดับผลการประเมินผลการปฏิบัติราชการในรอบ 5 ปี
|
||||
/// </summary>
|
||||
/// <param name="type">type </param>
|
||||
/// <returns></returns>
|
||||
/// <response code="200">เมื่อทำการอ่านข้อมูลจาก Relational Database สำเร็จ</response>
|
||||
/// <response code="401">ไม่ได้ Login เข้าระบบ</response>
|
||||
/// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
|
||||
[HttpPost("report3/{type}")]
|
||||
public async Task<ActionResult<ResponseObject>> GetInsigniaReport3Async([FromBody] GetInsigniaDetailByNodeReportDto req, string type)
|
||||
{
|
||||
try
|
||||
{
|
||||
var getPermission = await _permission.GetPermissionAPIAsync("GET", "SYS_INSIGNIA_REPORT");
|
||||
var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
|
||||
if (jsonData["status"]?.ToString() != "200")
|
||||
{
|
||||
return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
|
||||
}
|
||||
|
||||
var result = new
|
||||
{
|
||||
template = "reportInsignia2",
|
||||
reportName = "reportInsignia2",
|
||||
data = new List<dynamic>()
|
||||
};
|
||||
return Success(result);
|
||||
|
||||
}
|
||||
catch
|
||||
{
|
||||
throw;
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue