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

แก้ ตำแหน่ง โครงสร้าง

Browse source
This commit is contained in:
kittapath 2024-09-19 15:57:01 +07:00
parent 475d42cbe4
commit d175165cea
8 changed files with 51 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/controllers/CommandController.ts
View file

@ -183,6 +183,8 @@ export class CommandController extends Controller {
detailHeader: command.detailHeader,
detailBody: command.detailBody,
detailFooter: command.detailFooter,
commandAffectDate: command.commandAffectDate,
commandExcecuteDate: command.commandExcecuteDate,
commandTypeName: command.commandType?.name || null,
commandSysId: command.commandType?.commandSysId || null,
};
@ -207,6 +209,8 @@ export class CommandController extends Controller {
detailHeader: string | null;
detailBody: string | null;
detailFooter: string | null;
commandAffectDate: Date | null;
commandExcecuteDate: Date | null;
},
@Request() request: RequestWithUser,
) {

6
src/controllers/CommandTypeController.ts
View file

@ -54,6 +54,8 @@ export class CommandTypeController extends Controller {
"detailHeader",
"detailBody",
"detailFooter",
"subtitle",
"isAttachment",
"createdAt",
"lastUpdatedAt",
"createdFullName",
@ -114,6 +116,8 @@ export class CommandTypeController extends Controller {
"detailHeader",
"detailBody",
"detailFooter",
"subtitle",
"isAttachment",
],
});
if (!_commandType) {
@ -201,7 +205,7 @@ export class CommandTypeController extends Controller {
_commandType.lastUpdateUserId = request.user.sub;
_commandType.lastUpdateFullName = request.user.name;
_commandType.lastUpdatedAt = new Date();
this.commandTypeRepository.merge(_commandType, requestBody);
Object.assign(_commandType, requestBody);
await this.commandTypeRepository.save(_commandType);
return new HttpSuccess(_commandType.id);
}

4
src/controllers/EmployeePositionController.ts
View file

@ -633,8 +633,8 @@ export class EmployeePositionController extends Controller {
let _null: any = null;
posMaster.posMasterNo = requestBody.posMasterNo;
posMaster.isDirector = requestBody.isDirector;
posMaster.isStaff = requestBody.isStaff;
posMaster.positionSign = requestBody.positionSign == null ? _null : requestBody.positionSign;
// posMaster.isStaff = requestBody.isStaff == null?_null:requestBody.isStaff;
// posMaster.positionSign = requestBody.positionSign == null ? _null : requestBody.positionSign;
// posMaster.isOfficer = requestBody.isOfficer;
posMaster.posMasterNoPrefix = requestBody.posMasterNoPrefix;
posMaster.posMasterNoSuffix = requestBody.posMasterNoSuffix;

4
src/controllers/PositionController.ts
View file

@ -840,9 +840,9 @@ export class PositionController extends Controller {
}
let _null: any = null;
posMaster.isDirector = requestBody.isDirector;
posMaster.isStaff = requestBody.isStaff;
posMaster.isStaff = requestBody.isStaff == null || requestBody.isStaff == undefined ? _null : requestBody.isStaff;
// posMaster.isOfficer = requestBody.isOfficer;
posMaster.positionSign = requestBody.positionSign == null ? _null : requestBody.positionSign;
posMaster.positionSign = requestBody.positionSign == null || requestBody.positionSign == undefined ? _null : requestBody.positionSign;
posMaster.posMasterNo = requestBody.posMasterNo;
posMaster.posMasterNoPrefix = requestBody.posMasterNoPrefix;
posMaster.posMasterNoSuffix = requestBody.posMasterNoSuffix;