[Edit SIT ระบบพัฒนา] รายการที่ต้องแก้ไข #1331

src/entities/DevelopmentAddress.ts

@@ -20,7 +20,7 @@ export class DevelopmentAddress extends EntityBase {
 
   @Column({
     nullable: true,
-    comment: "โครงการ/หลักสูตรการฝึกอบรม",
+    comment: "ชื่อจังหวัด (กรณีเลือกสถานที่ดำเนินการในประเทศ)",
     default: null,
   })
   provinceName: string;
@@ -32,6 +32,20 @@ export class DevelopmentAddress extends EntityBase {
   })
   developmentId: string;
 
+  @Column({
+    nullable: true,
+    comment: "สถานที่ดำเนินการ ในประเทศ(IN_COUNTRY) หรือ ต่างประเทศ(ABROAD)",
+    default: null,
+  })
+  addressType: string;
+
+  @Column({
+    nullable: true,
+    comment: "ชื่อประเทศ (กรณีเลือกสถานที่ดำเนินการต่างประเทศ)",
+    default: null,
+  })
+  country: string;
+
   @ManyToOne(() => Development, (development: Development) => development.developmentAddresss)
   @JoinColumn({ name: "developmentId" })
   development: Development;
@@ -39,6 +53,16 @@ export class DevelopmentAddress extends EntityBase {
 export class CreateDevelopmentAddress {
   @Column()
   address: string | null;
+
   @Column()
   provinceId: string | null;
+  
+  @Column()
+  addressType?: string | null;
+
+  @Column()
+  provinceName?: string | null;
+
+  @Column()
+  country?: string | null;
 }

src/entities/DevelopmentScholarship.ts

@@ -301,7 +301,7 @@ export class DevelopmentScholarship extends EntityBase {
     comment: "ใช้เวลาราชการ",
     default: false,
   })
-  useOfficialTime: boolean;
+  useOfficialTime: string;
 
   @Column({
     nullable: true,
@@ -567,6 +567,13 @@ export class DevelopmentScholarship extends EntityBase {
     default: null,
   })
   graduatedReason: string;
+
+  @Column({
+    nullable: true,
+    comment: "เงินอื่นๆ",
+    default: null,
+  })
+  budgetSourceOther: number;
 }
 export class CreateDevelopmentScholarship {
   rootId: string | null;
@@ -604,7 +611,7 @@ export class CreateDevelopmentScholarship {
   bookNo: string | null;
   bookNoDate: Date | null;
   bookApproveDate: Date | null;
-  useOfficialTime: boolean | false;
+  useOfficialTime: string | null;
   changeDetail: string | null;
   scholarshipType: string | null;
   fundType: string | null;
@@ -631,6 +638,7 @@ export class CreateDevelopmentScholarship {
   totalPeriod: string | null;
   planType: string | null;
   isNoUseBudget: boolean | null;
+  budgetSourceOther?: number | null;
 }
 
 export class UpdateDevelopmentScholarship {
@@ -669,7 +677,7 @@ export class UpdateDevelopmentScholarship {
   bookNo: string | null;
   bookNoDate: Date | null;
   bookApproveDate: Date | null;
-  useOfficialTime: boolean | false;
+  useOfficialTime: string | null;
   changeDetail: string | null;
   scholarshipType: string | null;
   fundType: string | null;
@@ -696,6 +704,7 @@ export class UpdateDevelopmentScholarship {
   totalPeriod: string | null;
   planType: string | null;
   isNoUseBudget: boolean | null;
+  budgetSourceOther?: number | null;
 }
 
 export class UpdateDevelopmentScholarshipUser {
@@ -706,4 +715,5 @@ export class UpdateDevelopmentScholarshipUser {
   isGraduated: boolean | null;
   graduatedDate: Date | null;
   graduatedReason: string | null;
+  budgetSourceOther?: number | null;
 }