Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop

src/controllers/ProfileEmployeeController.ts

@@ -2103,29 +2103,12 @@ export class ProfileEmployeeController extends Controller {
       .andWhere(
         new Brackets((qb) => {
           qb.where(
-            requestBody.keyword != null && requestBody.keyword != ""
+             requestBody.keyword != null && requestBody.keyword != ""
-              ? "profileEmployee.prefix LIKE :keyword"
+              ? `CONCAT(profileEmployee.prefix, profileEmployee.firstName," ",profileEmployee.lastName) LIKE :keyword`
               : "1=1",
             {
               keyword: `%${requestBody.keyword}%`,
-            },
+            })
-          )
-            .orWhere(
-              requestBody.keyword != null && requestBody.keyword != ""
-                ? "profileEmployee.firstName LIKE :keyword"
-                : "1=1",
-              {
-                keyword: `%${requestBody.keyword}%`,
-              },
-            )
-            .orWhere(
-              requestBody.keyword != null && requestBody.keyword != ""
-                ? "profileEmployee.lastName LIKE :keyword"
-                : "1=1",
-              {
-                keyword: `%${requestBody.keyword}%`,
-              },
-            )
             .orWhere(
               requestBody.keyword != null && requestBody.keyword != ""
                 ? "profileEmployee.citizenId LIKE :keyword"

src/controllers/ProfileEmployeeTempController.ts

@@ -1703,28 +1703,11 @@ export class ProfileEmployeeTempController extends Controller {
         new Brackets((qb) => {
           qb.where(
             requestBody.keyword != null && requestBody.keyword != ""
-              ? "profileEmployee.prefix LIKE :keyword"
+              ? `CONCAT(profileEmployee.prefix, profileEmployee.firstName," ",profileEmployee.lastName) LIKE :keyword`
               : "1=1",
             {
               keyword: `%${requestBody.keyword}%`,
-            },
+            })
-          )
-            .orWhere(
-              requestBody.keyword != null && requestBody.keyword != ""
-                ? "profileEmployee.firstName LIKE :keyword"
-                : "1=1",
-              {
-                keyword: `%${requestBody.keyword}%`,
-              },
-            )
-            .orWhere(
-              requestBody.keyword != null && requestBody.keyword != ""
-                ? "profileEmployee.lastName LIKE :keyword"
-                : "1=1",
-              {
-                keyword: `%${requestBody.keyword}%`,
-              },
-            )
             .orWhere(
               requestBody.keyword != null && requestBody.keyword != ""
                 ? "profileEmployee.citizenId LIKE :keyword"
@@ -1732,7 +1715,31 @@ export class ProfileEmployeeTempController extends Controller {
               {
                 keyword: `%${requestBody.keyword}%`,
               },
-            );
+            )
+            // .orWhere(
+            //   requestBody.keyword != null && requestBody.keyword != ""
+            //     ? "profileEmployee.position LIKE :keyword"
+            //     : "1=1",
+            //   {
+            //     keyword: `%${requestBody.keyword}%`,
+            //   },
+            // )
+            // .orWhere(
+            //   requestBody.keyword != null && requestBody.keyword != ""
+            //     ? "posType.posTypeName LIKE :keyword"
+            //     : "1=1",
+            //   {
+            //     keyword: `%${requestBody.keyword}%`,
+            //   },
+            // )
+            // .orWhere(
+            //   requestBody.keyword != null && requestBody.keyword != ""
+            //     ? `CONCAT(posType.posTypeShortName," ",posLevel.posLevelName) LIKE :keyword`
+            //     : "1=1",
+            //   {
+            //     keyword: `%${requestBody.keyword}%`,
+            //   },
+            // );
         }),
       )
       .andWhere(

src/controllers/ProfileSalaryTempController.ts

@@ -1114,6 +1114,7 @@ export class ProfileSalaryTempController extends Controller {
         } else if (profileEmployee) {
           history.profileEmployeeId = profileId;
         }
+        history.returnedDate = new Date();
         history.examinerName = req.user.name;
         history.createdFullName = req.user.name;
         history.lastUpdateFullName = req.user.name;

src/entities/PositionSalaryEditHistory.ts

@@ -57,7 +57,6 @@ export class PositionSalaryEditHistory extends EntityBase {
 }
 
 export class CreatePositionSalaryEditHistory {
-  returnedDate: Date;
   detailForEdit: string | null;
 }
 

src/entities/ProfileSalaryTemp.ts

@@ -342,6 +342,8 @@ export class CreateProfileSalaryTemp {
   isGovernment?: boolean | null;
   positionCee?: string | null;
   commandName?: string | null;
+  posNumCodeSit?: string | null;
+  posNumCodeSitAbb?: string | null;
 }
 
 export type UpdateProfileSalaryTemp = {
@@ -373,4 +375,6 @@ export type UpdateProfileSalaryTemp = {
   isGovernment?: boolean | null;
   positionCee?: string | null;
   commandName?: string | null;
+  posNumCodeSit?: string | null;
+  posNumCodeSitAbb?: string | null;
 };