Merge branch 'adiDev' into develop

src/controllers/SalaryController.ts

@@ -92,6 +92,7 @@ export class Salary extends Controller {
         salarys.isActive = false;
       }
       salarys.salaryType = salarys.salaryType.toUpperCase();
+      salarys.isSpecial = salarys.isSpecial;
       salarys.createdUserId = request.user.sub;
       salarys.createdFullName = request.user.name;
       salarys.lastUpdateUserId = request.user.sub;
@@ -247,6 +248,7 @@ export class Salary extends Controller {
         where: { id: id },
         select: [
           "salaryType",
+          "isSpecial",
           "posTypeId",
           "posLevelId",
           "isActive",
@@ -290,6 +292,7 @@ export class Salary extends Controller {
         const filteredSalary = salary.filter(
           (x) =>
             x.salaryType?.toString().includes(keyword) ||
+            x.isSpecial?.toString().includes(keyword) || //new 20.02.67
             x.posLevel_?.posLevelName?.toString().includes(keyword) ||
             x.posType_?.posTypeName?.toString().includes(keyword) ||
             x.isActive?.toString().includes(keyword) ||
@@ -302,6 +305,7 @@ export class Salary extends Controller {
         const formattedData = filteredSalary.map((item) => ({
           id: item.id,
           salaryType: item.salaryType,
+          isSpecial: item.isSpecial,
           posTypeId: item.posType_?.id,
           posType: item.posType_?.posTypeName,
           posLevelId: item.posLevel_?.id,
@@ -323,6 +327,7 @@ export class Salary extends Controller {
       const formattedData = salary.map((item) => ({
         id: item.id,
         salaryType: item.salaryType,
+        isSpecial: item.isSpecial,
         posTypeId: item.posType_?.id,
         posType: item.posType_?.posTypeName,
         posLevelId: item.posLevel_?.id,

src/entities/Salarys.ts

@@ -61,6 +61,12 @@ export class Salarys extends EntityBase {
   })
   details: string;
 
+  @Column({
+    comment: "ฉ",
+    default: false,
+  })
+  isSpecial: boolean;
+
   @OneToMany(() => SalaryRanks, (salaryRanks) => salaryRanks.salarys_)
   salaryRanks_: SalaryRanks[];
 
@@ -98,7 +104,9 @@ export class CreateSalary {
 
   @Column()
   details?: string;
-  
+
+  @Column()
+  isSpecial: boolean;
 }
   
 export type UpdateSalary = Partial<CreateSalary> ;