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

แก้ไขการเรียงลำดับ บช2-3 เรียงตามเลขที่ใหม่

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2023-06-22 05:34:01 +07:00
parent 2940777197
commit bd1ec56e82
2 changed files with 290 additions and 289 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Controllers/OrganizationReportController.cs
View file

@ -162,7 +162,8 @@ namespace BMA.EHR.Report.Service.Controllers
{ {
try try
{ {
var data = await _organizationReportService.GetReport2Query(id); var data = (await _organizationReportService.GetReport2Query(id)).OrderBy(x => x.OcOrder).ThenBy(x => x.PositionNumberIntNew).ToList();
var result_data = new List<Account2ResultItem>(); var result_data = new List<Account2ResultItem>();
foreach (var d in data) foreach (var d in data)
{ {
@ -245,7 +246,7 @@ namespace BMA.EHR.Report.Service.Controllers
} }
} }
// <summary> /// <summary>
/// รายงานบัญชี 3 /// รายงานบัญชี 3
/// </summary> /// </summary>
/// <param name="id">รหัสสำนัก</param> /// <param name="id">รหัสสำนัก</param>
@ -267,7 +268,7 @@ namespace BMA.EHR.Report.Service.Controllers
{ {
try try
{ {
var data = await _organizationReportService.GetReport2Query(id); var data = (await _organizationReportService.GetReport2Query(id)).OrderBy(x => x.OcOrder).ThenBy(x => x.PositionNumberIntNew).ToList();
var result_data = new List<Account2ResultItem>(); var result_data = new List<Account2ResultItem>();
foreach (var d in data) foreach (var d in data)
{ {

4
Services/OrganizationReportService.cs
View file

@ -374,9 +374,9 @@ namespace BMA.EHR.Report.Service.Services
PositionTypeNew = ptNew == null ? null : ptNew.Name, PositionTypeNew = ptNew == null ? null : ptNew.Name,
}) })
.ToList()
.OrderBy(x => x.OcOrder).ThenBy(x => GetPosnoIntFromPosNo(x.PositionNumberOld))
.ToList(); .ToList();
//.OrderBy(x => x.OcOrder).ThenBy(x => GetPosnoIntFromPosNo(x.PositionNumberOld))
//.ToList();
var results = new List<Account2ResultItem>(); var results = new List<Account2ResultItem>();