#881

src/controllers/CommandController.ts

@@ -224,7 +224,23 @@ export class CommandController extends Controller {
         .getRawMany();
       profilekArray = profiles.map((p) => p.keycloak);
     }
-
+    //only search command name
+    let baseKeyword = keyword;
+    let yearKeyword = "";
+    const regex = /\/(\d{4})$/;
+    const match = keyword.match(regex);
+    if (match) {
+      baseKeyword = keyword.substring(0, keyword.lastIndexOf('/')).trim();
+      yearKeyword = match[1].trim();
+    }
+    let yearInBC = yearKeyword ? (parseInt(yearKeyword) - 543) : null;
+    //
+    
+    // console.log("k>>",keyword);
+    // console.log("bk>>",baseKeyword);
+    // console.log("yk>>",yearKeyword);
+    // console.log("yi>>",yearInBC);
+    
     const [commands, total] = await this.commandRepository
       .createQueryBuilder("command")
       .andWhere(
@@ -276,8 +292,8 @@ export class CommandController extends Controller {
       )
       .andWhere(
         new Brackets((qb) => {
-          qb.where(keyword != null && keyword != "" ? "command.commandNo LIKE :keyword" : "1=1", {
+          qb.where(keyword != null && keyword != "" ? "command.commandNo LIKE :baseKeyword" : "1=1", {
-            keyword: `%${keyword}%`,
+            baseKeyword: `%${baseKeyword}%`,
           })
             .orWhere(keyword != null && keyword != "" ? "command.issue LIKE :keyword" : "1=1", {
               keyword: `%${keyword}%`,