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

Merge branch 'develop' into working

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2024-10-28 10:20:03 +07:00
commit 400ed73809
11 changed files with 515 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

36
.github/workflows/release_Retirement.yaml vendored
View file

@ -69,21 +69,21 @@ jobs:
docker compose pull
docker compose up -d
echo "${{ steps.gen_ver.outputs.image_ver }}"> success
- uses: snow-actions/line-notify@v1.1.0
if: success()
with:
access_token: ${{ env.TOKEN_LINE }}
message: |
-Success✅✅✅
Image: ${{env.IMAGE_NAME}}
Version: ${{ github.event.inputs.IMAGE_VER }}
By: ${{secrets.DOCKER_USER}}
- uses: snow-actions/line-notify@v1.1.0
if: failure()
with:
access_token: ${{ env.TOKEN_LINE }}
message: |
-Failure❌❌❌
Image: ${{env.IMAGE_NAME}}
Version: ${{ github.event.inputs.IMAGE_VER }}
By: ${{secrets.DOCKER_USER}}
# - uses: snow-actions/line-notify@v1.1.0
# if: success()
# with:
# access_token: ${{ env.TOKEN_LINE }}
# message: |
# -Success✅✅✅
# Image: ${{env.IMAGE_NAME}}
# Version: ${{ github.event.inputs.IMAGE_VER }}
# By: ${{secrets.DOCKER_USER}}
# - uses: snow-actions/line-notify@v1.1.0
# if: failure()
# with:
# access_token: ${{ env.TOKEN_LINE }}
# message: |
# -Failure❌❌❌
# Image: ${{env.IMAGE_NAME}}
# Version: ${{ github.event.inputs.IMAGE_VER }}
# By: ${{secrets.DOCKER_USER}}

36
.github/workflows/release_discipline.yaml vendored
View file

@ -69,21 +69,21 @@ jobs:
docker compose pull
docker compose up -d
echo "${{ steps.gen_ver.outputs.image_ver }}"> success
- uses: snow-actions/line-notify@v1.1.0
if: success()
with:
access_token: ${{ env.TOKEN_LINE }}
message: |
-Success✅✅✅
Image: ${{env.IMAGE_NAME}}
Version: ${{ github.event.inputs.IMAGE_VER }}
By: ${{secrets.DOCKER_USER}}
- uses: snow-actions/line-notify@v1.1.0
if: failure()
with:
access_token: ${{ env.TOKEN_LINE }}
message: |
-Failure❌❌❌
Image: ${{env.IMAGE_NAME}}
Version: ${{ github.event.inputs.IMAGE_VER }}
By: ${{secrets.DOCKER_USER}}
# - uses: snow-actions/line-notify@v1.1.0
# if: success()
# with:
# access_token: ${{ env.TOKEN_LINE }}
# message: |
# -Success✅✅✅
# Image: ${{env.IMAGE_NAME}}
# Version: ${{ github.event.inputs.IMAGE_VER }}
# By: ${{secrets.DOCKER_USER}}
# - uses: snow-actions/line-notify@v1.1.0
# if: failure()
# with:
# access_token: ${{ env.TOKEN_LINE }}
# message: |
# -Failure❌❌❌
# Image: ${{env.IMAGE_NAME}}
# Version: ${{ github.event.inputs.IMAGE_VER }}
# By: ${{secrets.DOCKER_USER}}

36
.github/workflows/release_placement.yaml vendored
View file

@ -69,21 +69,21 @@ jobs:
docker compose pull
docker compose up -d
echo "${{ steps.gen_ver.outputs.image_ver }}"> success
- uses: snow-actions/line-notify@v1.1.0
if: success()
with:
access_token: ${{ env.TOKEN_LINE }}
message: |
-Success✅✅✅
Image: ${{env.IMAGE_NAME}}
Version: ${{ github.event.inputs.IMAGE_VER }}
By: ${{secrets.DOCKER_USER}}
- uses: snow-actions/line-notify@v1.1.0
if: failure()
with:
access_token: ${{ env.TOKEN_LINE }}
message: |
-Failure❌❌❌
Image: ${{env.IMAGE_NAME}}
Version: ${{ github.event.inputs.IMAGE_VER }}
By: ${{secrets.DOCKER_USER}}
# - uses: snow-actions/line-notify@v1.1.0
# if: success()
# with:
# access_token: ${{ env.TOKEN_LINE }}
# message: |
# -Success✅✅✅
# Image: ${{env.IMAGE_NAME}}
# Version: ${{ github.event.inputs.IMAGE_VER }}
# By: ${{secrets.DOCKER_USER}}
# - uses: snow-actions/line-notify@v1.1.0
# if: failure()
# with:
# access_token: ${{ env.TOKEN_LINE }}
# message: |
# -Failure❌❌❌
# Image: ${{env.IMAGE_NAME}}
# Version: ${{ github.event.inputs.IMAGE_VER }}
# By: ${{secrets.DOCKER_USER}}

18
BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs
View file

@ -1013,7 +1013,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
.Where(x => req.refIds.Select(x => x.refId).Contains(x.Id.ToString()))
.ToListAsync();
var resultData = (from p in data
var report_data = (from p in data
join r in req.refIds
on p.Id.ToString() equals r.refId
select new
@ -1025,7 +1025,21 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
salary = r.Amount
}).ToList();
return Success(resultData);
var result = new List<dynamic>();
foreach (var r in report_data)
{
result.Add(r);
string? _null = null;
result.Add(new {
fullName = _null,
positionname = r.RemarkHorizontal,
positionno = _null,
organizationname = _null,
salary = _null,
});
}
return Success(result);
}
catch
{

132
BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs
View file

@ -857,7 +857,34 @@ namespace BMA.EHR.Placement.Service.Controllers
RemarkHorizontal = r.RemarkHorizontal,
RemarkVertical = r.RemarkVertical,
}).ToList();
return Success(report_data);
var result = new List<dynamic>();
foreach (var r in report_data)
{
result.Add(r);
string? _null = null;
result.Add(new {
No = _null,
FullName = r.RemarkHorizontal,
Education = _null,
OldOc = _null,
OldPositionType = _null,
OldPositionLevel = _null,
OldPositionNumber = _null,
OldSalary = _null,
LeaveDate = _null,
NewOc = _null,
NewPositionType = _null,
NewPositionLevel = _null,
NewPositionNumber = _null,
NewSalary = _null,
AppointDate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
return Success(result);
}
catch
{
@ -1036,7 +1063,34 @@ namespace BMA.EHR.Placement.Service.Controllers
RemarkHorizontal = r.RemarkHorizontal,
RemarkVertical = r.RemarkVertical,
}).ToList();
return Success(report_data);
var result = new List<dynamic>();
foreach (var r in report_data)
{
result.Add(r);
string? _null = null;
result.Add(new {
No = _null,
FullName = r.RemarkHorizontal,
Education = _null,
OldOc = _null,
OldPositionType = _null,
OldPositionLevel = _null,
OldPositionNumber = _null,
OldSalary = _null,
LeaveDate = _null,
NewOc = _null,
NewPositionType = _null,
NewPositionLevel = _null,
NewPositionNumber = _null,
NewSalary = _null,
AppointDate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
return Success(result);
}
catch
{
@ -1193,7 +1247,29 @@ namespace BMA.EHR.Placement.Service.Controllers
RemarkHorizontal = r.RemarkHorizontal,
RemarkVertical = r.RemarkVertical,
}).ToList();
return Success(report_data);
var result = new List<dynamic>();
foreach (var r in report_data)
{
result.Add(r);
string? _null = null;
result.Add(new {
No = _null,
FullName = r.RemarkHorizontal,
OldOrganization = _null,
OldPositionLevel = _null,
OldPositionNumber = _null,
OldSalary = _null,
NewOc = _null,
NewPositionLevel = _null,
NewPositionNumber = _null,
NewSalary = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
return Success(result);
}
catch
{
@ -1345,7 +1421,27 @@ namespace BMA.EHR.Placement.Service.Controllers
RemarkHorizontal = r.RemarkHorizontal,
RemarkVertical = r.RemarkVertical,
}).ToList();
return Success(report_data);
var result = new List<dynamic>();
foreach (var r in report_data)
{
result.Add(r);
string? _null = null;
result.Add(new {
No = _null,
FullName = r.RemarkHorizontal,
OldOc = _null,
OldPositionNumber = _null,
OldSalary = _null,
NewOc = _null,
NewPositionNumber = _null,
NewSalary = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
return Success(result);
}
catch
{
@ -1508,7 +1604,33 @@ namespace BMA.EHR.Placement.Service.Controllers
RemarkHorizontal = r.RemarkHorizontal,
RemarkVertical = r.RemarkVertical,
}).ToList();
return Success(report_data);
var result = new List<dynamic>();
foreach (var r in report_data)
{
result.Add(r);
string? _null = null;
result.Add(new {
No = _null,
FullName = r.RemarkHorizontal,
Education = _null,
OldOc = _null,
OldPositionType = _null,
OldPositionLevel = _null,
OldPositionNumber = _null,
OldSalary = _null,
NewOc = _null,
NewPositionType = _null,
NewPositionLevel = _null,
NewPositionNumber = _null,
NewSalary = _null,
AppointDate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
return Success(result);
}
catch
{

146
BMA.EHR.Placement.Service/Controllers/PlacementController.cs
View file

@ -1599,7 +1599,34 @@ namespace BMA.EHR.Placement.Service.Controllers
RemarkHorizontal = r.RemarkHorizontal,
RemarkVertical = r.RemarkVertical,
}).ToList();
return Success(report_data);
var result = new List<dynamic>();
foreach (var r in report_data)
{
result.Add(r);
string? _null = null;
result.Add(new {
No = _null,
FullName = r.RemarkHorizontal,
Education = _null,
PositionName = _null,
ExamNumber = _null,
PlacementName = _null,
Oc = _null,
PositionType = _null,
PositionLevel = _null,
PositionNumber = _null,
Salary = _null,
AppointDate = _null,
OccupationPosition = _null,
PositionCandidate = _null,
OcCandidate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
return Success(result);
}
catch
{
@ -1871,7 +1898,33 @@ namespace BMA.EHR.Placement.Service.Controllers
RemarkHorizontal = r.RemarkHorizontal,
RemarkVertical = r.RemarkVertical,
}).ToList();
return Success(report_data);
var result = new List<dynamic>();
foreach (var r in report_data)
{
result.Add(r);
string? _null = null;
result.Add(new {
No = _null,
FullName = r.RemarkHorizontal,
Education = _null,
PositionName = _null,
ExamNumber = _null,
PlacementName = _null,
Oc = _null,
PositionType = _null,
PositionLevel = _null,
PositionNumber = _null,
Salary = _null,
AppointDate = _null,
OccupationPosition = _null,
PositionCandidate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
return Success(result);
}
catch
{
@ -2162,7 +2215,35 @@ namespace BMA.EHR.Placement.Service.Controllers
RemarkHorizontal = r.RemarkHorizontal,
RemarkVertical = r.RemarkVertical,
}).ToList();
return Success(report_data);
var result = new List<dynamic>();
foreach (var r in report_data)
{
result.Add(r);
string? _null = null;
result.Add(new {
No = _null,
FullName = r.RemarkHorizontal,
Education = _null,
OldOc = _null,
OldPositionType = _null,
OldPositionLevel = _null,
OldPositionNumber = _null,
OldSalary = _null,
OldPosition = _null,
NewOc = _null,
NewPosition = _null,
NewPositionType = _null,
NewPositionLevel = _null,
NewPositionNumber = _null,
NewSalary = _null,
AppointDate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
return Success(result);
}
catch
{
@ -2356,7 +2437,35 @@ namespace BMA.EHR.Placement.Service.Controllers
RemarkHorizontal = r.RemarkHorizontal,
RemarkVertical = r.RemarkVertical,
}).ToList();
return Success(report_data);
var result = new List<dynamic>();
foreach (var r in report_data)
{
result.Add(r);
string? _null = null;
result.Add(new {
No = _null,
FullName = r.RemarkHorizontal,
Education = _null,
OldOc = _null,
OldPosition = _null,
OldPositionType = _null,
OldPositionLevel = _null,
OldPositionNumber = _null,
OldSalary = _null,
NewOc = _null,
NewPosition = _null,
NewPositionType = _null,
NewPositionLevel = _null,
NewPositionNumber = _null,
NewSalary = _null,
AppointDate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
return Success(result);
}
catch
{
@ -2542,7 +2651,34 @@ namespace BMA.EHR.Placement.Service.Controllers
RemarkHorizontal = r.RemarkHorizontal,
RemarkVertical = r.RemarkVertical,
}).ToList();
return Success(report_data);
var result = new List<dynamic>();
foreach (var r in report_data)
{
result.Add(r);
string? _null = null;
result.Add(new {
No = _null,
FullName = r.RemarkHorizontal,
Education = _null,
OldOc = _null,
OldPositionType = _null,
OldPositionLevel = _null,
OldPositionNumber = _null,
OldSalary = _null,
LeaveDate = _null,
NewOc = _null,
NewPositionType = _null,
NewPositionLevel = _null,
NewPositionNumber = _null,
NewSalary = _null,
AppointDate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
return Success(result);
}
catch
{

21
BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs
View file

@ -660,7 +660,26 @@ namespace BMA.EHR.Placement.Service.Controllers
RemarkHorizontal = r.RemarkHorizontal,
RemarkVertical = r.RemarkVertical,
}).ToList();
return Success(report_data);
var result = new List<dynamic>();
foreach (var r in report_data)
{
result.Add(r);
string? _null = null;
result.Add(new {
No = _null,
FullName = r.RemarkHorizontal,
PositionName = _null,
Organization = _null,
StartDate = _null,
EndDate = _null,
Reason = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
return Success(result);
}
catch
{

28
BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs
View file

@ -14,6 +14,7 @@ using Newtonsoft.Json.Linq;
using Swashbuckle.AspNetCore.Annotations;
using System.Net.Http.Headers;
using System.Security.Claims;
using System.Reflection;
namespace BMA.EHR.Placement.Service.Controllers
{
@ -991,7 +992,32 @@ namespace BMA.EHR.Placement.Service.Controllers
RemarkHorizontal = r.RemarkHorizontal,
RemarkVertical = r.RemarkVertical,
}).ToList();
return Success(report_data);
var result = new List<dynamic>();
foreach (var r in report_data)
{
result.Add(r);
string? _null = null;
result.Add(new {
No = _null,
FullName = r.RemarkHorizontal,
Education = _null,
OldOc = _null,
OldPositionType = _null,
OldPositionLevel = _null,
OldSalary = _null,
NewOc = _null,
NewPositionType = _null,
NewPositionLevel = _null,
NewPositionNumber = _null,
NewSalary = _null,
AppointDate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
return Success(result);
}
catch
{

24
BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs
View file

@ -866,7 +866,29 @@ namespace BMA.EHR.Placement.Service.Controllers
RemarkHorizontal = r.RemarkHorizontal,
RemarkVertical = r.RemarkVertical,
}).ToList();
return Success(report_data);
var result = new List<dynamic>();
foreach (var r in report_data)
{
result.Add(r);
string? _null = null;
result.Add(new {
No = _null,
FullName = r.RemarkHorizontal,
OldOc = _null,
PositionType = _null,
PositionLevel = _null,
PositionNumber = _null,
Salary = _null,
ReceiveOrganizationName = _null,
ActiveDate = _null,
Reason = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
return Success(result);
}
catch
{

59
BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs
View file

@ -713,7 +713,34 @@ namespace BMA.EHR.Retirement.Service.Controllers
RemarkHorizontal = r.RemarkHorizontal,
RemarkVertical = r.RemarkVertical,
}).ToList();
return Success(report_data);
var result = new List<dynamic>();
foreach (var r in report_data)
{
result.Add(r);
string? _null = null;
result.Add(new {
No = _null,
FullName = r.RemarkHorizontal,
Education = _null,
OldOc = _null,
OldPositionType = _null,
OldPositionLevel = _null,
OldPositionNumber = _null,
OldSalary = _null,
LeaveDate = _null,
NewOc = _null,
NewPositionType = _null,
NewPositionLevel = _null,
NewPositionNumber = _null,
NewSalary = _null,
AppointDate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
return Success(result);
}
catch
{
@ -886,7 +913,35 @@ namespace BMA.EHR.Retirement.Service.Controllers
RemarkHorizontal = r.RemarkHorizontal,
RemarkVertical = r.RemarkVertical,
}).ToList();
return Success(report_data);
var result = new List<dynamic>();
foreach (var r in report_data)
{
result.Add(r);
string? _null = null;
result.Add(new {
No = _null,
FullName = r.RemarkHorizontal,
Education = _null,
OldOc = _null,
OldPositionType = _null,
OldPositionLevel = _null,
OldPositionNumber = _null,
OldSalary = _null,
LeaveDate = _null,
MilitaryDate = _null,
NewOc = _null,
NewPositionType = _null,
NewPositionLevel = _null,
NewPositionNumber = _null,
NewSalary = _null,
AppointDate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
return Success(result);
}
catch
{

54
BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
View file

@ -1743,7 +1743,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
orderby r.Sequence
select new
{
Seq = r.Sequence.ToString().ToThaiNumber(),
No = r.Sequence.ToString().ToThaiNumber(),
CitizenId = r.CitizenId == null ? "-" : r.CitizenId.ToThaiNumber(),
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
PositionName = p.PositionOld ?? "",
@ -1757,7 +1757,30 @@ namespace BMA.EHR.Retirement.Service.Controllers
RemarkHorizontal = r.RemarkHorizontal,
RemarkVertical = r.RemarkVertical,
}).ToList();
return Success(report_data);
var result = new List<dynamic>();
foreach (var r in report_data)
{
result.Add(r);
string? _null = null;
result.Add(new {
No = _null,
FullName = r.RemarkHorizontal,
CitizenId = _null,
PositionName = _null,
Organization = _null,
PositionLevel = _null,
PositionType = _null,
PositionNumber = _null,
ActiveDate = _null,
Salary = _null,
Remark = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
return Success(result);
}
catch
{
@ -1984,7 +2007,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
orderby r.Sequence
select new
{
Seq = r.Sequence.ToString().ToThaiNumber(),
No = r.Sequence.ToString().ToThaiNumber(),
CitizenId = r.CitizenId == null ? "-" : r.CitizenId.ToThaiNumber(),
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
PositionName = p.PositionOld ?? "",
@ -1998,7 +2021,30 @@ namespace BMA.EHR.Retirement.Service.Controllers
RemarkHorizontal = r.RemarkHorizontal,
RemarkVertical = r.RemarkVertical,
}).ToList();
return Success(report_data);
var result = new List<dynamic>();
foreach (var r in report_data)
{
result.Add(r);
string? _null = null;
result.Add(new {
No = _null,
FullName = r.RemarkHorizontal,
CitizenId = _null,
PositionName = _null,
Organization = _null,
PositionLevel = _null,
PositionType = _null,
PositionNumber = _null,
ActiveDate = _null,
Salary = _null,
Remark = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
return Success(result);
}
catch
{