Merge branch 'develop' into dev

src/controllers/DevelopmentScholarshipController.ts

@@ -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;

src/controllers/ReportController.ts

@@ -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
           ? ""