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

Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop

Browse source
This commit is contained in:
mamoss 2025-05-13 11:49:08 +07:00
commit e4708c6f98
1 changed files with 28 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

49
src/controllers/CommandController.ts
View file

@ -3435,9 +3435,10 @@ export class CommandController extends Controller {
profile.leaveRemark = clearProfile.leaveRemark ?? _null; profile.leaveRemark = clearProfile.leaveRemark ?? _null;
profile.leaveDate = item.commandDateAffect ?? _null; profile.leaveDate = item.commandDateAffect ?? _null;
profile.leaveType = clearProfile.LeaveType ?? _null; profile.leaveType = clearProfile.LeaveType ?? _null;
profile.position = _null; //ออกจากราชการ ไม่ต้องลบตำแหน่งในทะเบียน (issue #1516)
profile.posTypeId = _null; // profile.position = _null;
profile.posLevelId = _null; // profile.posTypeId = _null;
// profile.posLevelId = _null;
} }
if (item.isGovernment == true) { if (item.isGovernment == true) {
const returnWork = await checkReturnCommandType(String(item.commandId)); const returnWork = await checkReturnCommandType(String(item.commandId));
@ -3657,9 +3658,10 @@ export class CommandController extends Controller {
profile.leaveRemark = clearProfile.leaveRemark ?? _null; profile.leaveRemark = clearProfile.leaveRemark ?? _null;
profile.leaveDate = item.commandDateAffect ?? _null; profile.leaveDate = item.commandDateAffect ?? _null;
profile.leaveType = clearProfile.LeaveType ?? _null; profile.leaveType = clearProfile.LeaveType ?? _null;
profile.position = _null; //ออกจากราชการ ไม่ต้องลบตำแหน่งในทะเบียน (issue #1516)
profile.posTypeId = _null; // profile.position = _null;
profile.posLevelId = _null; // profile.posTypeId = _null;
// profile.posLevelId = _null;
} }
await this.profileEmployeeRepository.save(profile); await this.profileEmployeeRepository.save(profile);
}), }),
@ -3798,9 +3800,10 @@ export class CommandController extends Controller {
profile.leaveRemark = clearProfile.leaveRemark ?? _null; profile.leaveRemark = clearProfile.leaveRemark ?? _null;
profile.leaveDate = item.commandDateAffect ?? _null; profile.leaveDate = item.commandDateAffect ?? _null;
profile.leaveType = clearProfile.LeaveType ?? _null; profile.leaveType = clearProfile.LeaveType ?? _null;
profile.position = _null; //ออกจากราชการ ไม่ต้องลบตำแหน่งในทะเบียน (issue #1516)
profile.posTypeId = _null; // profile.position = _null;
profile.posLevelId = _null; // profile.posTypeId = _null;
// profile.posLevelId = _null;
profile.leaveReason = item.leaveReason ?? _null; profile.leaveReason = item.leaveReason ?? _null;
profile.dateLeave = item.dateLeave ?? _null; profile.dateLeave = item.dateLeave ?? _null;
profile.amount = item.amount ?? _null; profile.amount = item.amount ?? _null;
@ -4251,9 +4254,10 @@ export class CommandController extends Controller {
_profile.leaveRemark = clearProfile.leaveRemark ?? _null; _profile.leaveRemark = clearProfile.leaveRemark ?? _null;
_profile.leaveDate = item.commandDateAffect ?? _null; _profile.leaveDate = item.commandDateAffect ?? _null;
_profile.leaveType = clearProfile.LeaveType ?? _null; _profile.leaveType = clearProfile.LeaveType ?? _null;
_profile.position = _null; //ออกจากราชการ ไม่ต้องลบตำแหน่งในทะเบียน (issue #1516)
_profile.posTypeId = _null; // _profile.position = _null;
_profile.posLevelId = _null; // _profile.posTypeId = _null;
// _profile.posLevelId = _null;
} }
await this.profileRepository.save(_profile); await this.profileRepository.save(_profile);
} }
@ -4449,9 +4453,10 @@ export class CommandController extends Controller {
_profile.leaveRemark = clearProfile.leaveRemark ?? _null; _profile.leaveRemark = clearProfile.leaveRemark ?? _null;
_profile.leaveDate = item.commandDateAffect ?? _null; _profile.leaveDate = item.commandDateAffect ?? _null;
_profile.leaveType = clearProfile.LeaveType ?? _null; _profile.leaveType = clearProfile.LeaveType ?? _null;
_profile.position = _null; //ออกจากราชการ ไม่ต้องลบตำแหน่งในทะเบียน (issue #1516)
_profile.posTypeId = _null; // _profile.position = _null;
_profile.posLevelId = _null; // _profile.posTypeId = _null;
// _profile.posLevelId = _null;
} }
await this.profileEmployeeRepository.save(_profile); await this.profileEmployeeRepository.save(_profile);
} }
@ -4733,9 +4738,10 @@ export class CommandController extends Controller {
_profile.leaveRemark = clearProfile.leaveRemark ?? _null; _profile.leaveRemark = clearProfile.leaveRemark ?? _null;
_profile.leaveDate = item.commandDateAffect ?? _null; _profile.leaveDate = item.commandDateAffect ?? _null;
_profile.leaveType = clearProfile.LeaveType ?? _null; _profile.leaveType = clearProfile.LeaveType ?? _null;
_profile.position = _null; //ออกจากราชการ ไม่ต้องลบตำแหน่งในทะเบียน (issue #1516)
_profile.posTypeId = _null; // _profile.position = _null;
_profile.posLevelId = _null; // _profile.posTypeId = _null;
// _profile.posLevelId = _null;
} }
await this.profileEmployeeRepository.save(_profile); await this.profileEmployeeRepository.save(_profile);
} }
@ -5162,9 +5168,10 @@ export class CommandController extends Controller {
_profile.leaveRemark = clearProfile.leaveRemark ?? _null; _profile.leaveRemark = clearProfile.leaveRemark ?? _null;
_profile.leaveDate = item.commandDateAffect ?? _null; _profile.leaveDate = item.commandDateAffect ?? _null;
_profile.leaveType = clearProfile.LeaveType ?? _null; _profile.leaveType = clearProfile.LeaveType ?? _null;
_profile.position = _null; //ออกจากราชการ ไม่ต้องลบตำแหน่งในทะเบียน (issue #1516)
_profile.posTypeId = _null; // _profile.position = _null;
_profile.posLevelId = _null; // _profile.posTypeId = _null;
// _profile.posLevelId = _null;
} }
await Promise.all([ await Promise.all([
this.profileRepository.save(_profile), this.profileRepository.save(_profile),