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

แก้env

Browse source
This commit is contained in:
Kittapath 2024-07-09 00:04:18 +07:00
parent 54b90e1472
commit 41d28c4d7f
13 changed files with 37 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -13,7 +13,8 @@ env:
IMAGE_NAME: ehr/bma-ehr-retirement-service
DEPLOY_HOST: frappet.com
DEPLOY_PORT: 10102
COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-retirement
COMPOSE_PATH: /home/frappet/docker/bma-ehr
# COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-retirement
TOKEN_LINE: uxuK5hDzS2DsoC5piJBrWRLiz8GgY7iMZZldOWsDDF0
jobs:

3
.github/workflows/release_command.yaml vendored
View file

@ -13,7 +13,8 @@ env:
IMAGE_NAME: ehr/bma-ehr-command-service
DEPLOY_HOST: frappet.com
DEPLOY_PORT: 10102
COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-command
COMPOSE_PATH: /home/frappet/docker/bma-ehr
# COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-command
TOKEN_LINE: uxuK5hDzS2DsoC5piJBrWRLiz8GgY7iMZZldOWsDDF0
jobs:

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

@ -13,7 +13,8 @@ env:
IMAGE_NAME: ehr/bma-ehr-discipline-service
DEPLOY_HOST: frappet.com
DEPLOY_PORT: 10102
COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-discipline
COMPOSE_PATH: /home/frappet/docker/bma-ehr
# COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-discipline
TOKEN_LINE: uxuK5hDzS2DsoC5piJBrWRLiz8GgY7iMZZldOWsDDF0
jobs:

3
.github/workflows/release_insignia.yaml vendored
View file

@ -13,7 +13,8 @@ env:
IMAGE_NAME: ehr/bma-ehr-insignia-service
DEPLOY_HOST: frappet.com
DEPLOY_PORT: 10102
COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-insignia
COMPOSE_PATH: /home/frappet/docker/bma-ehr
# COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-insignia
TOKEN_LINE: uxuK5hDzS2DsoC5piJBrWRLiz8GgY7iMZZldOWsDDF0
jobs:

3
.github/workflows/release_leave.yaml vendored
View file

@ -13,7 +13,8 @@ env:
IMAGE_NAME: ehr/bma-ehr-leave-service
DEPLOY_HOST: frappet.com
DEPLOY_PORT: 10102
COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-leave
COMPOSE_PATH: /home/frappet/docker/bma-ehr
# COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-leave
TOKEN_LINE: uxuK5hDzS2DsoC5piJBrWRLiz8GgY7iMZZldOWsDDF0
jobs:

3
.github/workflows/release_orgEmployee.yaml vendored
View file

@ -13,7 +13,8 @@ env:
IMAGE_NAME: ehr/bma-ehr-org-employee-service
DEPLOY_HOST: frappet.com
DEPLOY_PORT: 10102
COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-org-employee
COMPOSE_PATH: /home/frappet/docker/bma-ehr
# COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-org-employee
TOKEN_LINE: uxuK5hDzS2DsoC5piJBrWRLiz8GgY7iMZZldOWsDDF0
jobs:

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

@ -13,7 +13,8 @@ env:
IMAGE_NAME: ehr/bma-ehr-placement-service
DEPLOY_HOST: frappet.com
DEPLOY_PORT: 10102
COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-placement
COMPOSE_PATH: /home/frappet/docker/bma-ehr
# COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-placement
TOKEN_LINE: uxuK5hDzS2DsoC5piJBrWRLiz8GgY7iMZZldOWsDDF0
jobs:

3
.github/workflows/release_report.yaml vendored
View file

@ -13,7 +13,8 @@ env:
IMAGE_NAME: ehr/bma-ehr-report-v2-service
DEPLOY_HOST: frappet.com
DEPLOY_PORT: 10102
COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-report-v2
COMPOSE_PATH: /home/frappet/docker/bma-ehr
# COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-report-v2
TOKEN_LINE: uxuK5hDzS2DsoC5piJBrWRLiz8GgY7iMZZldOWsDDF0
jobs:

10
BMA.EHR.Application/Repositories/Commands/CommandRepository.cs
View file

@ -5626,7 +5626,7 @@ namespace BMA.EHR.Application.Repositories.Commands
CommandAffectDate = command.CommandAffectDate,
CommandNo = command.CommandNo,
CommandYear = command.CommandYear.ToInteger().ToThaiYear(),
Detail = "คำสั่งลงโทษ ตัดเงินเดือน"
Detail = "คำสั่งลงโทษ ปลดออกจากราชการ"
});
var _baseAPI = _configuration["API"];
@ -5778,7 +5778,7 @@ namespace BMA.EHR.Application.Repositories.Commands
commandAffectDate = command.CommandAffectDate,
commandNo = command.CommandNo,
commandYear = command.CommandYear.ToInteger().ToThaiYear(),
detail = "คำสั่งลงโทษ ตัดเงินเดือน"
detail = "คำสั่งลงโทษ ไล่ออกจากราชการ"
});
var _baseAPI = _configuration["API"];
@ -6418,7 +6418,7 @@ namespace BMA.EHR.Application.Repositories.Commands
CommandAffectDate = command.CommandAffectDate,
CommandNo = command.CommandNo,
CommandYear = command.CommandYear.ToInteger().ToThaiYear(),
Detail = "คำสั่งลงโทษ ตัดเงินเดือน"
Detail = "คำสั่งลงโทษ พักจากราชการ"
});
var baseAPI = _configuration["API"];
@ -6551,7 +6551,7 @@ namespace BMA.EHR.Application.Repositories.Commands
CommandAffectDate = command.CommandAffectDate,
CommandNo = command.CommandNo,
CommandYear = command.CommandYear.ToInteger().ToThaiYear(),
Detail = "คำสั่งลงโทษ ตัดเงินเดือน"
Detail = "คำสั่งลงโทษ ให้ออกจากราชการไว้ก่อน"
});
var baseAPI = _configuration["API"];
@ -6685,7 +6685,7 @@ namespace BMA.EHR.Application.Repositories.Commands
CommandAffectDate = command.CommandAffectDate,
CommandNo = command.CommandNo,
CommandYear = command.CommandYear.ToInteger().ToThaiYear(),
Detail = "คำสั่งลงโทษ ตัดเงินเดือน"
Detail = "คำสั่งลงโทษ ลงโทษ ภาคทัณฑ์"
});
var baseAPI = _configuration["API"];

2
BMA.EHR.Discipline.Service/Controllers/DisciplineDisciplinaryController.cs
View file

@ -777,7 +777,7 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
if (data.Status.Trim().ToUpper() != "NEW")
return Error(new Exception("ไม่สามารถยุติเรื่องได้"), (int)StatusCodes.Status500InternalServerError);
if (data.DisciplinaryStatusResult == null || data.DisciplinaryStatusResult.Trim().ToUpper() != "NO_CAUSE")
return Error(new Exception("ไม่สามารถยุติเรื่องได้"), (int)StatusCodes.Status500InternalServerError);
return Error(new Exception("ไม่สามารถยุติเรื่องได้ จะสามารถยุติเรื่องได้ในกรณีผลการสืบสวนไม่มีมูล"), (int)StatusCodes.Status500InternalServerError);
data.Status = "STOP";
await _context.SaveChangesAsync();

2
BMA.EHR.Discipline.Service/Controllers/DisciplineInvestigateController.cs
View file

@ -540,7 +540,7 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
if (data.Status.Trim().ToUpper() != "NEW")
return Error(new Exception("ไม่สามารถยุติเรื่องได้"), StatusCodes.Status500InternalServerError);
if (data.InvestigationStatusResult == null || data.InvestigationStatusResult.Trim().ToUpper() != "NO_CAUSE")
return Error(new Exception("ไม่สามารถยุติเรื่องได้"), StatusCodes.Status500InternalServerError);
return Error(new Exception("ไม่สามารถยุติเรื่องได้ จะสามารถยุติเรื่องได้ในกรณีผลการสืบสวนไม่มีมูล"), StatusCodes.Status500InternalServerError);
data.Status = "STOP";
await _context.SaveChangesAsync();

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

@ -415,12 +415,12 @@ namespace BMA.EHR.Placement.Service.Controllers
if (uppdated == null)
return Error(GlobalMessages.PlacementOfficerNotFound, 404);
uppdated.PositionNumberOld = req.PositionNumberOld;
uppdated.PositionOld = req.PositionOld;
//uppdated.PositionNumberOld = req.PositionNumberOld;
//uppdated.PositionOld = req.PositionOld;
uppdated.OrganizationPositionOld = req.OrganizationPositionOld;
uppdated.PositionLevelOld = req.PositionLevelOld;
uppdated.PositionTypeOld = req.PositionTypeOld;
uppdated.AmountOld = req.AmountOld;
//uppdated.PositionLevelOld = req.PositionLevelOld;
//uppdated.PositionTypeOld = req.PositionTypeOld;
//uppdated.AmountOld = req.AmountOld;
uppdated.Organization = req.Organization;
uppdated.Reason = req.Reason;
uppdated.DateStart = req.DateStart;

18
BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs
View file

@ -296,15 +296,15 @@ namespace BMA.EHR.Placement.Service.Controllers
if (uppdated == null)
return Error(GlobalMessages.PlacementRepatriationNotFound, 404);
uppdated.PositionNumberOld = req.PositionNumberOld;
uppdated.DateRepatriation = req.DateRepatriation;
uppdated.OrganizationPositionOld = req.OrganizationPositionOld;
uppdated.PositionLevelOld = req.PositionLevelOld;
uppdated.PositionTypeOld = req.PositionTypeOld;
uppdated.AmountOld = req.AmountOld;
uppdated.Organization = req.Organization;
uppdated.Reason = req.Reason;
uppdated.Date = req.Date;
uppdated.PositionNumberOld = req.PositionNumberOld;//
uppdated.DateRepatriation = req.DateRepatriation;//
uppdated.OrganizationPositionOld = req.OrganizationPositionOld;//
uppdated.PositionLevelOld = req.PositionLevelOld;//
uppdated.PositionTypeOld = req.PositionTypeOld;//
uppdated.AmountOld = req.AmountOld;//
uppdated.Organization = req.Organization;//
uppdated.Reason = req.Reason;//
uppdated.Date = req.Date;//
uppdated.LastUpdateFullName = FullName ?? "System Administrator";
uppdated.LastUpdateUserId = UserId ?? "";
uppdated.LastUpdatedAt = DateTime.Now;