hrms-bangkok/hrms-api-development
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 50s
Details

Browse source
This commit is contained in:
harid 2025-12-16 11:28:21 +07:00
commit 1eaea6c854
4 changed files with 67 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/controllers/DevelopmentController.ts
View file

@ -3201,16 +3201,17 @@ export class DevelopmentController extends Controller {
const before = null;
let status = null;
let _null: any = null;
if (oldProfile != null) {
throw new HttpError(HttpStatusCode.INTERNAL_SERVER_ERROR, "ข้อมูลนี้ได้ถูกบันทึกแล้ว");
}
if (oldProfile != null) {
if (oldProfile.isDone == true)
throw new HttpError(HttpStatusCode.INTERNAL_SERVER_ERROR, "ข้อมูลนี้ได้ถูกบันทึกแล้ว");
oldProfile.dateStart = requestBody.dateStart == undefined ? _null : requestBody.dateStart;
oldProfile.dateEnd = requestBody.dateEnd == undefined ? _null : requestBody.dateEnd;
oldProfile.order = requestBody.commandNumber == undefined ? _null : requestBody.commandNumber;
oldProfile.dateOrder =
requestBody.commandDate == undefined ? _null : new Date(requestBody.commandDate);
oldProfile.trainingDays =
requestBody.trainingDays == undefined ? _null : requestBody.trainingDays;
oldProfile.dateOrder = requestBody.commandDate == undefined ? _null : new Date(requestBody.commandDate);
oldProfile.trainingDays = requestBody.trainingDays == undefined ? _null : requestBody.trainingDays;
oldProfile.createdUserId = request.user.sub;
oldProfile.createdFullName = request.user.name;
oldProfile.lastUpdateUserId = request.user.sub;

1
src/controllers/DevelopmentEmployeeHistoryController.ts
View file

@ -260,6 +260,7 @@ export class DevelopmentEmployeeHistoryController extends Controller {
.leftJoinAndSelect("developmentHistory.development", "development")
.leftJoinAndSelect("developmentHistory.employeePosLevel", "employeePosLevel")
.leftJoinAndSelect("developmentHistory.employeePosType", "employeePosType")
.where("developmentHistory.isProfile IS TRUE")
.andWhere(
body.year != 0 && body.year != null && body.year != undefined
? "development.year = :year"

90
src/controllers/DevelopmentScholarshipController.ts
View file

@ -170,6 +170,16 @@ export class DevelopmentScholarshipController extends Controller {
_data = x;
})
.catch((x) => {});
if (keyword && ["กำลังศึกษา", "เรียนไม่จบ", "เรียนจบ"].includes(keyword.trim())) {
const mapStatus: Record<string, string> = {
"กำลังศึกษา": "PENDING",
"เรียนไม่จบ": "NOTGRADUATE",
"เรียนจบ": "GRADUATE",
};
keyword = mapStatus[keyword.trim()];
}
let query = await AppDataSource.getRepository(DevelopmentScholarship)
.createQueryBuilder("developmentScholarship")
.leftJoinAndSelect("developmentScholarship.posLevel", "posLevel")
@ -196,42 +206,50 @@ export class DevelopmentScholarshipController extends Controller {
keyword: `%${keyword}%`,
},
)
.orWhere(
keyword != null && keyword != ""
? "developmentScholarship.citizenId LIKE :keyword"
: "1=1",
{
keyword: `%${keyword}%`,
},
)
.orWhere(
keyword != null && keyword != ""
? "developmentScholarship.position LIKE :keyword"
: "1=1",
{
keyword: `%${keyword}%`,
},
)
.orWhere(
keyword != null && keyword != ""
? "developmentScholarship.posExecutive LIKE :keyword"
: "1=1",
{
keyword: `%${keyword}%`,
},
)
.orWhere(
keyword != null && keyword != "" ? "posType.posTypeName LIKE :keyword" : "1=1",
{
keyword: `%${keyword}%`,
},
)
.orWhere(
keyword != null && keyword != "" ? "posLevel.posLevelName LIKE :keyword" : "1=1",
{
keyword: `%${keyword}%`,
},
);
.orWhere(
keyword != null && keyword != ""
? "developmentScholarship.citizenId LIKE :keyword"
: "1=1",
{
keyword: `%${keyword}%`,
},
)
.orWhere(
keyword != null && keyword != ""
? "developmentScholarship.position LIKE :keyword"
: "1=1",
{
keyword: `%${keyword}%`,
},
)
.orWhere(
keyword != null && keyword != ""
? "developmentScholarship.posExecutive LIKE :keyword"
: "1=1",
{
keyword: `%${keyword}%`,
},
)
.orWhere(
keyword != null && keyword != ""
? "developmentScholarship.status LIKE :keyword"
: "1=1",
{
keyword: `${keyword}`,
},
)
.orWhere(
keyword != null && keyword != "" ? "posType.posTypeName LIKE :keyword" : "1=1",
{
keyword: `%${keyword}%`,
},
)
.orWhere(
keyword != null && keyword != "" ? "posLevel.posLevelName LIKE :keyword" : "1=1",
{
keyword: `%${keyword}%`,
},
);
}),
)
.andWhere(

9
src/controllers/ReportController.ts
View file

@ -658,13 +658,18 @@ export class ReportController extends Controller {
: Extension.ToThaiNumber(Extension.ToThaiFullDate3(getDevelopment.graduatedDate)),
graduatedReason: getDevelopment.graduatedReason == null ? "" : getDevelopment.graduatedReason,
useOfficialTime: getDevelopment.useOfficialTime,
useOffTime: getDevelopment.useOfficialTime == "NOUSETIME" ? "🗹 ใช้ ☐ ไม่ใช้" : "☐ ใช้ 🗹 ไม่ใช้",
useOffTime:
getDevelopment.useOfficialTime == "NOUSETIME"
? "☐ ใช้ 🗹 ไม่ใช้ เวลาราชการ"
: getDevelopment.useOfficialTime == "USETIME"
? "🗹 ใช้ ☐ ไม่ใช้ เวลาราชการ"
: "🗹 ใช้ ☐ ไม่ใช้ เวลาราชการบางส่วน",
isGraduated: getDevelopment.isGraduated,
isG1: getDevelopment.isGraduated == true ? "🗹" : "☐",
isG2: getDevelopment.isGraduated == true ? "☐" : "🗹",
totalPeriod:
getDevelopment.totalPeriod == null || getDevelopment.totalPeriod == ""
? ""
? "-"
: Extension.ToThaiNumber(getDevelopment.totalPeriod),
};