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

แก้env

Browse source
This commit is contained in:
Kittapath 2024-07-09 00:03:27 +07:00
parent bc6834f371
commit dda2b64bc2
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -9,7 +9,8 @@ env:
REGISTRY: docker.frappet.com REGISTRY: docker.frappet.com
IMAGE_NAME: ehr/bma-ehr-salary-service IMAGE_NAME: ehr/bma-ehr-salary-service
DEPLOY_HOST: frappet.com DEPLOY_HOST: frappet.com
COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-salary COMPOSE_PATH: /home/frappet/docker/bma-ehr
# COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-salary
jobs: jobs:
# act workflow_dispatch -W .github/workflows/release.yaml --input IMAGE_VER=version-1.0.36 -s DOCKER_USER=admin -s DOCKER_PASS=FPTadmin2357 -s SSH_PASSWORD=FPTadmin2357 # act workflow_dispatch -W .github/workflows/release.yaml --input IMAGE_VER=version-1.0.36 -s DOCKER_USER=admin -s DOCKER_PASS=FPTadmin2357 -s SSH_PASSWORD=FPTadmin2357
release-test: release-test:

12
src/controllers/ReportController.ts
View file

@ -1666,7 +1666,7 @@ export class ReportController extends Controller {
salaryPeriodId: salaryPeriodId, salaryPeriodId: salaryPeriodId,
}, },
type: In(["HAFT", "FULL", "FULLHAFT"]), type: In(["HAFT", "FULL", "FULLHAFT"]),
isRetired: false, //กรองเฉพาะคนที่ไม่เกษียณ isRetired: salaryPeriod.period === "APR" ? In([true, false]) : false, //กรองเฉพาะคนที่ไม่เกษียณเฉพาะรอบตุลา
}, },
order: { order: {
salaryOrg: { salaryOrg: {
@ -1846,8 +1846,8 @@ export class ReportController extends Controller {
}); });
return new HttpSuccess({ return new HttpSuccess({
template: salaryPeriod.period == "APR" ? "gov1-04" : "gov2-04", template: salaryPeriod.period == "APR" ? "gov1-04" : "gov2-04-01",
reportName: salaryPeriod.period == "APR" ? "gov1-04" : "gov2-04", reportName: salaryPeriod.period == "APR" ? "gov1-04" : "gov2-04-01",
data: { data: {
year: Extension.ToThaiNumber(String(Extension.ToThaiYear(salaryPeriod.year))), year: Extension.ToThaiNumber(String(Extension.ToThaiYear(salaryPeriod.year))),
effectiveDate: salaryPeriod.effectiveDate, effectiveDate: salaryPeriod.effectiveDate,
@ -2036,8 +2036,8 @@ export class ReportController extends Controller {
}); });
return new HttpSuccess({ return new HttpSuccess({
template: salaryPeriod.period == "APR" ? "gov1-05" : "gov2-05", template: salaryPeriod.period == "APR" ? "gov1-05" : "gov2-05-01",
reportName: salaryPeriod.period == "APR" ? "gov1-05" : "gov2-05", reportName: salaryPeriod.period == "APR" ? "gov1-05" : "gov2-05-01",
data: { data: {
year: Extension.ToThaiNumber(String(Extension.ToThaiYear(salaryPeriod.year))), year: Extension.ToThaiNumber(String(Extension.ToThaiYear(salaryPeriod.year))),
agency: root, agency: root,
@ -2302,7 +2302,7 @@ export class ReportController extends Controller {
}, },
relations: ["salaryProfiles"], relations: ["salaryProfiles"],
}); });
const salaryProfileSpecial = await this.salaryProfileRepository.find({ const salaryProfileSpecial = await this.salaryProfileRepository.find({
relations: ["salaryOrg"], relations: ["salaryOrg"],
where: { where: {