#1009 , #1016 , #1022 ,#1014, #1051

src/controllers/ReportController.ts

@@ -2351,7 +2351,7 @@ export class ReportController extends Controller {
         posMasterNo: "ASC",
       },
     });
-
+    
     const profileSpecial = salaryProfileSpecial.map((item, index) => ({
       no: Extension.ToThaiNumber(String(index + 1)),
       fullname: item.prefix + item.firstName + " " + item.lastName,
@@ -2375,7 +2375,7 @@ export class ReportController extends Controller {
         item.amountSpecial == undefined || item.amountSpecial == null
           ? "๐"
           : Extension.ToThaiNumber(String(item.amountSpecial.toLocaleString())),
-      remark: item.remark ?? null,
+      remark: item.remark ?? "",
     }));
 
     const profileNoAmount = salaryProfileNoAmount.map((item, index) => ({
@@ -2397,7 +2397,7 @@ export class ReportController extends Controller {
         item.amount == undefined || item.amount == null
           ? "๐"
           : Extension.ToThaiNumber(String(item.amount.toLocaleString())),
-      remark: item.remark ?? null,
+      remark: item.remark ?? "",
     }));
 
     return new HttpSuccess({
@@ -2440,6 +2440,7 @@ export class ReportController extends Controller {
       relations: ["salaryPeriod", "salaryProfiles"],
       where: {
         snapshot: "SNAP2",
+        group: "GROUP1",
         rootId: rootId,
         salaryPeriodId: salaryPeriodId,
       },
@@ -2972,16 +2973,16 @@ export class ReportController extends Controller {
         position: profile.position,
         posLevel: profile.posLevel
           ? `${profile.posTypeShort} ${Extension.ToThaiNumber(profile.posLevel.toLocaleString())}`
-          : null,
-        posNumber:
+          : "-",
+        posNumber: profile.orgShortName || profile.posMasterNo ?
           Extension.ToThaiNumber(profile.orgShortName) +
-          Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
-        amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
+          Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()):"-",
+        amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : "-",
         positionSalaryAmount: profile.positionSalaryAmount
           ? Extension.ToThaiNumber(profile.positionSalaryAmount.toLocaleString())
-          : null,
-        reasonSign: null,
-        score: profile.result, //สรุปผลการประเมินฯ ระดับและคะแนน
+          : "-",
+        reasonSign: "-",
+        score: profile.result??"-", //สรุปผลการประเมินฯ ระดับและคะแนน
         reason: profile.remark, //เหตุผลที่ไม่สมควรหรือไม่อาจเลื่อนขั้นค่าจ้าง
       };
     });
@@ -5710,31 +5711,37 @@ export class ReportController extends Controller {
       const affiliation = fullNameParts
         .filter((part) => part !== undefined && part !== null)
         .join("/");
+
+      const positionParts = [
+        profile.position,
+        profile.child4,
+        profile.child3,
+        profile.child2,
+        profile.child1,
+        profile.root,
+      ];
+
+      const position = positionParts
+        .filter((part) => part !== undefined && part !== null)
+        .join("/");
       const fullName = `${profile.prefix}${profile.firstName} ${profile.lastName}`;
 
       return {
         no: Extension.ToThaiNumber((index + 1).toLocaleString()),
         fullName: fullName,
         affiliation: affiliation,
-        position:
-          profile.position +
-          "/" +
-          (profile.child4 == undefined && profile.child4 == null ? "" : profile.child4 + "/") +
-          (profile.child3 == undefined && profile.child3 == null ? "" : profile.child3 + "/") +
-          (profile.child2 == undefined && profile.child2 == null ? "" : profile.child2 + "/") +
-          (profile.child1 == undefined && profile.child1 == null ? "" : profile.child1 + "/") +
-          (profile.root == undefined && profile.root == null ? "" : profile.root),
+        position: position,
         posLevel: profile.posLevel
           ? Extension.ToThaiNumber(profile.posLevel.toLocaleString())
-          : null,
+          : "-",
         posNumber:
           Extension.ToThaiNumber(profile.orgShortName) +
           Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
-        amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
+        amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : "-",
         positionSalaryAmount: profile.positionSalaryAmount
           ? Extension.ToThaiNumber(profile.positionSalaryAmount.toLocaleString())
-          : null,
-        reason: null,
+          : "-",
+        reason: profile.remark??null,
       };
     });
 
@@ -5907,14 +5914,14 @@ export class ReportController extends Controller {
         no: Extension.ToThaiNumber((index + 1).toLocaleString()),
         fullName: fullName,
         affiliation: affiliation,
-        position: profile.position,
+        position: profile.position??"-",
         posLevel: profile.posLevel
           ? Extension.ToThaiNumber(profile.posLevel.toLocaleString())
-          : null,
+          : "-",
         posNumber:
-          Extension.ToThaiNumber(profile.orgShortName) +
-          Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
-        amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
+          profile.orgShortName || profile.posMasterNo? Extension.ToThaiNumber(profile.orgShortName) +
+          Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()):"-",
+        amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : "-",
         reason: null,
       };
     });
@@ -6239,21 +6246,21 @@ export class ReportController extends Controller {
 
       return {
         no: Extension.ToThaiNumber((index + 1).toLocaleString()),
-        fullName: fullName,
-        affiliation: affiliation,
-        position: profile.position,
+        fullName: fullName??"-",
+        affiliation: affiliation??"-",
+        position: profile.position??"-",
         posLevel: profile.posLevel
           ? Extension.ToThaiNumber(profile.posLevel.toLocaleString())
-          : null,
+          : "-",
         posNumber:
           Extension.ToThaiNumber(profile.orgShortName) +
           Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
-        amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
+        amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : "-",
         positionSalaryAmount: profile.positionSalaryAmount
           ? Extension.ToThaiNumber(profile.positionSalaryAmount.toLocaleString())
-          : null,
-        amountUseOld: amountUseOld ? Extension.ToThaiNumber(amountUseOld.toLocaleString()) : null,
-        amountUse: amountUse ? Extension.ToThaiNumber(amountUse.toLocaleString()) : null,
+          : "-",
+        amountUseOld: amountUseOld ? Extension.ToThaiNumber(amountUseOld.toLocaleString()) : "-",
+        amountUse: amountUse ? Extension.ToThaiNumber(amountUse.toLocaleString()) : "-",
         reason: null,
       };
     });