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

fix เช็ค ระบบพัฒนา #811

Browse source
This commit is contained in:
Bright 2024-11-28 14:43:01 +07:00
parent 06d6c07d3f
commit 531ebab3be
2 changed files with 13 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/controllers/DevelopmentEmployeeHistoryController.ts
View file

@ -270,36 +270,12 @@ export class DevelopmentEmployeeHistoryController extends Controller {
new Brackets((qb) => { new Brackets((qb) => {
qb.where( qb.where(
body.keyword != null && body.keyword != "" body.keyword != null && body.keyword != ""
? "developmentHistory.prefix LIKE :keyword" ? "CONCAT(developmentHistory.prefix, developmentHistory.firstName, ' ', developmentHistory.lastName) LIKE :keyword"
: "1=1", : "1=1",
{ {
keyword: `%${body.keyword}%`, keyword: `%${body.keyword}%`,
}, },
) )
.orWhere(
body.keyword != null && body.keyword != ""
? "developmentHistory.firstName LIKE :keyword"
: "1=1",
{
keyword: `%${body.keyword}%`,
},
)
.orWhere(
body.keyword != null && body.keyword != ""
? "developmentHistory.lastName LIKE :keyword"
: "1=1",
{
keyword: `%${body.keyword}%`,
},
)
.orWhere(
body.keyword != null && body.keyword != ""
? "developmentHistory.position LIKE :keyword"
: "1=1",
{
keyword: `%${body.keyword}%`,
},
)
.orWhere( .orWhere(
body.keyword != null && body.keyword != "" body.keyword != null && body.keyword != ""
? "developmentHistory.position LIKE :keyword" ? "developmentHistory.position LIKE :keyword"
@ -350,11 +326,15 @@ export class DevelopmentEmployeeHistoryController extends Controller {
const formattedData = development.map((item) => ({ const formattedData = development.map((item) => ({
id: item.id, id: item.id,
citizenId: item.citizenId, citizenId: item.citizenId,
fullName: item.prefix + item.firstName + " " + item.lastName, fullName: item.prefix != null && item.firstName != null && item.lastName != null
? `${item?.prefix}${item?.firstName} ${item?.lastName}`
: "",
position: item.position, position: item.position,
year: item.development.year, year: item.development.year,
posType: item.employeePosType ? item.employeePosType.posTypeName : null, posType: item.employeePosType ? item.employeePosType.posTypeName : null,
posLevel: item.employeePosLevel ? item.employeePosLevel.posLevelName : null, posLevel: item.employeePosType && item.employeePosLevel
? `${item.employeePosType.posTypeShortName}${item.employeePosLevel.posLevelName}`
: null,
projectName: item.development.projectName, projectName: item.development.projectName,
})); }));
@ -391,8 +371,8 @@ export class DevelopmentEmployeeHistoryController extends Controller {
position: getDevelopment.position, position: getDevelopment.position,
posLevelId: getDevelopment.employeePosLevelId, posLevelId: getDevelopment.employeePosLevelId,
posLevelName: posLevelName:
getDevelopment.employeePosLevel != null getDevelopment.employeePosType != null && getDevelopment.employeePosLevel != null
? getDevelopment.employeePosLevel.posLevelName ? `${getDevelopment.employeePosType.posTypeShortName} ${getDevelopment.employeePosLevel.posLevelName}`
: null, : null,
posTypeId: getDevelopment.employeePosTypeId, posTypeId: getDevelopment.employeePosTypeId,
posTypeName: posTypeName:

30
src/controllers/DevelopmentHistoryController.ts
View file

@ -265,36 +265,12 @@ export class DevelopmentOfficerHistoryController extends Controller {
new Brackets((qb) => { new Brackets((qb) => {
qb.where( qb.where(
body.keyword != null && body.keyword != "" body.keyword != null && body.keyword != ""
? "developmentHistory.prefix LIKE :keyword" ? "CONCAT(developmentHistory.prefix, developmentHistory.firstName, ' ', developmentHistory.lastName) LIKE :keyword"
: "1=1", : "1=1",
{ {
keyword: `%${body.keyword}%`, keyword: `%${body.keyword}%`,
}, },
) )
.orWhere(
body.keyword != null && body.keyword != ""
? "developmentHistory.firstName LIKE :keyword"
: "1=1",
{
keyword: `%${body.keyword}%`,
},
)
.orWhere(
body.keyword != null && body.keyword != ""
? "developmentHistory.lastName LIKE :keyword"
: "1=1",
{
keyword: `%${body.keyword}%`,
},
)
.orWhere(
body.keyword != null && body.keyword != ""
? "developmentHistory.position LIKE :keyword"
: "1=1",
{
keyword: `%${body.keyword}%`,
},
)
.orWhere( .orWhere(
body.keyword != null && body.keyword != "" body.keyword != null && body.keyword != ""
? "developmentHistory.position LIKE :keyword" ? "developmentHistory.position LIKE :keyword"
@ -344,7 +320,9 @@ export class DevelopmentOfficerHistoryController extends Controller {
const formattedData = development.map((item) => ({ const formattedData = development.map((item) => ({
id: item.id, id: item.id,
citizenId: item.citizenId, citizenId: item.citizenId,
fullName: item.prefix + item.firstName + " " + item.lastName, fullName: item.prefix == null && item.firstName == null && item.lastName == null
? ""
: `${item?.prefix}${item?.firstName} ${item?.lastName}`,
position: item.position, position: item.position,
year: item.development.year, year: item.development.year,
root: item.development.root, //test root: item.development.root, //test