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

Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 53s
Details

Browse source
This commit is contained in:
harid 2025-11-25 17:15:52 +07:00
commit 8b69a28c25
2 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/controllers/CommandController.ts
View file

@ -6041,6 +6041,7 @@ export class CommandController extends Controller {
profile.isProbation = item.bodyProfile.isProbation; profile.isProbation = item.bodyProfile.isProbation;
//เพิ่มใหม่จากรับโอน //เพิ่มใหม่จากรับโอน
profile.prefix = item.bodyProfile.prefix ?? null; profile.prefix = item.bodyProfile.prefix ?? null;
profile.prefixMain = item.bodyProfile.prefix ?? null;
profile.firstName = item.bodyProfile.firstName ?? null; profile.firstName = item.bodyProfile.firstName ?? null;
profile.lastName = item.bodyProfile.lastName ?? null; profile.lastName = item.bodyProfile.lastName ?? null;
profile.birthDate = item.bodyProfile.birthDate ?? null; profile.birthDate = item.bodyProfile.birthDate ?? null;
@ -6093,6 +6094,7 @@ export class CommandController extends Controller {
profile.amountSpecial = item.bodyProfile.amountSpecial ?? null; profile.amountSpecial = item.bodyProfile.amountSpecial ?? null;
profile.isProbation = item.bodyProfile.isProbation; profile.isProbation = item.bodyProfile.isProbation;
profile.prefix = item.bodyProfile.prefix ?? null; profile.prefix = item.bodyProfile.prefix ?? null;
profile.prefixMain = item.bodyProfile.prefix ?? null;
profile.firstName = item.bodyProfile.firstName ?? null; profile.firstName = item.bodyProfile.firstName ?? null;
profile.lastName = item.bodyProfile.lastName ?? null; profile.lastName = item.bodyProfile.lastName ?? null;
profile.birthDate = item.bodyProfile.birthDate ?? null; profile.birthDate = item.bodyProfile.birthDate ?? null;
@ -6152,6 +6154,7 @@ export class CommandController extends Controller {
item.bodyProfile.prefix && item.bodyProfile.prefix != "" item.bodyProfile.prefix && item.bodyProfile.prefix != ""
? item.bodyProfile.prefix ? item.bodyProfile.prefix
: profile.prefix; : profile.prefix;
profile.prefixMain = item.bodyProfile.prefix ?? null;
profile.firstName = profile.firstName =
item.bodyProfile.firstName && item.bodyProfile.firstName != "" item.bodyProfile.firstName && item.bodyProfile.firstName != ""
? item.bodyProfile.firstName ? item.bodyProfile.firstName

20
src/entities/view/viewPosMaster.ts
View file

@ -78,14 +78,18 @@ import { ViewColumn, ViewEntity } from "typeorm";
LEFT JOIN LEFT JOIN
posExecutive ON position.posExecutiveId = posExecutive.id posExecutive ON position.posExecutiveId = posExecutive.id
LEFT JOIN ( LEFT JOIN (
SELECT * SELECT *
FROM profileDiscipline pd1 FROM (
WHERE pd1.date = ( SELECT
SELECT MAX(pd2.date) pd.*,
FROM profileDiscipline pd2 ROW_NUMBER() OVER (
WHERE pd2.profileId = pd1.profileId PARTITION BY profileId
) ORDER BY date DESC, id DESC
) AS profileDiscipline ON profileDiscipline.profileId = profile.id ) AS rn
FROM profileDiscipline pd
) t
WHERE rn = 1
) AS profileDiscipline ON profileDiscipline.profileId = profile.id
LEFT JOIN ( LEFT JOIN (
SELECT pl1.* SELECT pl1.*
FROM profileLeave pl1 FROM profileLeave pl1