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

Merge branch 'develop' into adiDev

Browse source
This commit is contained in:
AdisakKanthawilang 2024-12-02 13:09:20 +07:00
commit 296f33b190
3 changed files with 100 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/controllers/CommandController.ts
View file

@ -699,7 +699,7 @@ export class CommandController extends Controller {
commandSend.lastUpdatedAt = new Date();
await this.commandSendRepository.save(commandSend);
if(commandSend && commandSend.id) {
let _ccName = new Array("INBOX", "EMAIL");
let _ccName = new Array("EMAIL", "INBOX");
let _dataSendCC = new Array();
for(let i=0; i<_ccName.length; i++) {
_dataSendCC.push({
@ -1808,6 +1808,23 @@ export class CommandController extends Controller {
commandSend.lastUpdateFullName = request.user.name;
commandSend.lastUpdatedAt = new Date();
await this.commandSendRepository.save(commandSend);
if(commandSend && commandSend.id) {
let _ccName = new Array("EMAIL", "INBOX");
let _dataSendCC = new Array();
for(let i=0; i<_ccName.length; i++) {
_dataSendCC.push({
commandSendId: commandSend.id,
name: _ccName[i],
createdUserId: request.user.sub,
createdFullName: request.user.name,
createdAt: new Date(),
lastUpdateUserId: request.user.sub,
lastUpdateFullName: request.user.name,
lastUpdatedAt: new Date(),
});
}
await this.commandSendCCRepository.save(_dataSendCC);
}
}),
);
@ -1849,6 +1866,23 @@ export class CommandController extends Controller {
commandSend.lastUpdateFullName = request.user.name;
commandSend.lastUpdatedAt = new Date();
await this.commandSendRepository.save(commandSend);
if(commandSend && commandSend.id) {
let _ccName = new Array("EMAIL", "INBOX");
let _dataSendCC = new Array();
for(let i=0; i<_ccName.length; i++) {
_dataSendCC.push({
commandSendId: commandSend.id,
name: _ccName[i],
createdUserId: request.user.sub,
createdFullName: request.user.name,
createdAt: new Date(),
lastUpdateUserId: request.user.sub,
lastUpdateFullName: request.user.name,
lastUpdatedAt: new Date(),
});
}
await this.commandSendCCRepository.save(_dataSendCC);
}
}),
);
}

76
src/controllers/ProfileController.ts
View file

@ -1400,22 +1400,22 @@ export class ProfileController extends Controller {
keyword: `%${body.keyword}%`,
},
)
.orWhere(
body.keyword != null && body.keyword != ""
? "viewDirectorActing.posLevel LIKE :keyword"
: "1=1",
{
keyword: `%${body.keyword}%`,
},
)
.orWhere(
body.keyword != null && body.keyword != ""
? "viewDirectorActing.posType LIKE :keyword"
: "1=1",
{
keyword: `%${body.keyword}%`,
},
)
// .orWhere(
// body.keyword != null && body.keyword != ""
// ? "viewDirectorActing.posLevel LIKE :keyword"
// : "1=1",
// {
// keyword: `%${body.keyword}%`,
// },
// )
// .orWhere(
// body.keyword != null && body.keyword != ""
// ? "viewDirectorActing.posType LIKE :keyword"
// : "1=1",
// {
// keyword: `%${body.keyword}%`,
// },
// )
.orWhere(
body.keyword != null && body.keyword != ""
? "viewDirectorActing.actFullName LIKE :keyword"
@ -1423,6 +1423,22 @@ export class ProfileController extends Controller {
{
keyword: `%${body.keyword}%`,
},
)
.orWhere(
body.keyword != null && body.keyword != ""
? "CONCAT(viewDirectorActing.posType, ' (', viewDirectorActing.posLevel, ')') LIKE :keyword"
: "1=1",
{
keyword: `%${body.keyword}%`,
},
)
.orWhere(
body.keyword != null && body.keyword != ""
? "viewDirectorActing.posNo LIKE :keyword"
: "1=1",
{
keyword: `%${body.keyword}%`,
},
);
}),
)
@ -1477,17 +1493,33 @@ export class ProfileController extends Controller {
keyword: `%${body.keyword}%`,
},
)
// .orWhere(
// body.keyword != null && body.keyword != ""
// ? "viewDirector.posLevel LIKE :keyword"
// : "1=1",
// {
// keyword: `%${body.keyword}%`,
// },
// )
// .orWhere(
// body.keyword != null && body.keyword != ""
// ? "viewDirector.posType LIKE :keyword"
// : "1=1",
// {
// keyword: `%${body.keyword}%`,
// },
// )
.orWhere(
body.keyword != null && body.keyword != ""
? "viewDirector.posLevel LIKE :keyword"
: "1=1",
{
keyword: `%${body.keyword}%`,
},
? "CONCAT(viewDirector.posType, ' (', viewDirector.posLevel, ')') LIKE :keyword"
: "1=1",
{
keyword: `%${body.keyword}%`,
},
)
.orWhere(
body.keyword != null && body.keyword != ""
? "viewDirector.posType LIKE :keyword"
? "viewDirector.posNo LIKE :keyword"
: "1=1",
{
keyword: `%${body.keyword}%`,

15
src/controllers/WorkflowController.ts
View file

@ -627,6 +627,9 @@ export class WorkflowController extends Controller {
});
if (!state) throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูลขั้นตอนการอนุมัติ");
if (state.stateUserComments.filter((x) => x.profileId == body.profileId).length > 0)
throw new HttpError(HttpStatus.NOT_FOUND, "มีผู้ใช้งานนี้อยู่แล้ว");
const stateUserComment = new StateUserComment();
stateUserComment.order = state.stateUserComments.length + 1;
stateUserComment.stateId = body.stateId;
@ -907,14 +910,16 @@ export class WorkflowController extends Controller {
{
keyword: `%${body.keyword}%`,
},
).orWhere(
)
.orWhere(
body.keyword != null && body.keyword != ""
? "viewDirectorActing.posNo LIKE :keyword"
: "1=1",
{
keyword: `%${body.keyword}%`,
},
).orWhere(
)
.orWhere(
body.keyword != null && body.keyword != ""
? "viewDirectorActing.posExecutiveName LIKE :keyword"
: "1=1",
@ -973,14 +978,16 @@ export class WorkflowController extends Controller {
{
keyword: `%${body.keyword}%`,
},
).orWhere(
)
.orWhere(
body.keyword != null && body.keyword != ""
? "viewDirector.posNo LIKE :keyword"
: "1=1",
{
keyword: `%${body.keyword}%`,
},
).orWhere(
)
.orWhere(
body.keyword != null && body.keyword != ""
? "viewDirector.posExecutiveName LIKE :keyword"
: "1=1",