Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop

src/controllers/ProfileDisciplineController.ts

@@ -34,24 +34,9 @@ export class ProfileDisciplineController extends Controller {
   private disciplineHistoryRepository = AppDataSource.getRepository(ProfileDisciplineHistory);
 
   @Get("{profileId}")
-  @Example({
-    status: 200,
-    message: "สำเร็จ",
-    result: [
-      {
-        id: "debfa8a7-83fb-4801-a940-8ae74e7638d3",
-        date: "2024-03-12T10:09:47.000Z",
-        level: "string",
-        detail: "string",
-        unStigma: "string",
-        refCommandNo: "string",
-        refCommandDate: "2024-03-12T10:09:47.000Z",
-      },
-    ],
-  })
   public async getDiscipline(@Path() profileId: string) {
     const lists = await this.disciplineRepository.find({
-      where: { profileId: profileId },
+      where: { profileEmployeeId: profileId },
       select: [
         "id",
         "date",

src/controllers/ProfileLeaveEmployeeController.ts

@@ -40,7 +40,7 @@ export class ProfileLeaveEmployeeController extends Controller {
   public async getLeave(@Path() profileId: string) {
     const record = await this.leaveRepo.find({
       relations: { leaveType: true },
-      where: { profileId },
+      where: { profileEmployeeId: profileId },
     });
     return new HttpSuccess(record);
   }

src/controllers/ProfileNopaidEmployeeController.ts

@@ -34,23 +34,9 @@ export class ProfileNopaidEmployeeController extends Controller {
   private nopaidHistoryRepository = AppDataSource.getRepository(ProfileNopaidHistory);
 
   @Get("{profileId}")
-  @Example({
-    status: 200,
-    message: "สำเร็จ",
-    result: [
-      {
-        id: "debfa8a7-83fb-4801-a940-8ae74e7638d3",
-        date: "2024-03-12T10:09:47.000Z",
-        reference: "string",
-        detail: "string",
-        refCommandNo: "string",
-        refCommandDate: "2024-03-12T10:09:47.000Z",
-      },
-    ],
-  })
   public async getNopaid(@Path() profileId: string) {
     const lists = await this.nopaidRepository.find({
-      where: { profileId },
+      where: { profileEmployeeId: profileId },
     });
     return new HttpSuccess(lists);
   }

src/entities/ProfileSalaryEmployee.ts

@@ -229,6 +229,7 @@ export class ProfileSalaryEmployee extends EntityBase {
   // commandNo: string;
 
   @Column({
+    nullable: true,
     comment: "ประเภทคำสั่ง",
     type: "text",
   })