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

Merge branch 'develop-Bright' into develop

Browse source
This commit is contained in:
harid 2026-03-06 15:31:30 +07:00
commit d78c7bc2e7
2 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/controllers/DevelopmentScholarshipController.ts
View file

@ -789,6 +789,9 @@ export class DevelopmentScholarshipController extends Controller {
if (!getDevelopment) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลทุนการศึกษา/ฝึกอบรมนี้");
}
if (getDevelopment.status == "PENDING") {
getDevelopment.status = "REPORTED";
}
const before = structuredClone(getDevelopment);
Object.assign(getDevelopment, requestBody);
getDevelopment.lastUpdateUserId = request.user.sub;

4
src/controllers/ReportController.ts
View file

@ -628,6 +628,10 @@ export class ReportController extends Controller {
field: getDevelopment.field,
studyPlace: getDevelopment.studyPlace,
scholarshipType: getDevelopment.scholarshipType,
bookNo:
getDevelopment.bookNo == null
? ""
: Extension.ToThaiNumber(getDevelopment.bookNo),
bookNoDate:
getDevelopment.bookNoDate == null
? ""