From 37d9edaa552e365e19d978f4cb60800d2709ee1b Mon Sep 17 00:00:00 2001
From: "vluk@2fi-solutions.com.hk" <vluk@2fi-solutions.com.hk>
Date: Thu, 30 Oct 2025 00:48:19 +0800
Subject: [PATCH] no message

---
 .../lioner/pdf/service/PdfService.java        | 217 +++++++++---------
 1 file changed, 109 insertions(+), 108 deletions(-)

diff --git a/src/main/java/com/ffii/lioner/modules/lioner/pdf/service/PdfService.java b/src/main/java/com/ffii/lioner/modules/lioner/pdf/service/PdfService.java
index ca19b8e..9ca0e69 100644
--- a/src/main/java/com/ffii/lioner/modules/lioner/pdf/service/PdfService.java
+++ b/src/main/java/com/ffii/lioner/modules/lioner/pdf/service/PdfService.java
@@ -1756,72 +1756,72 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
         setValueIfPresent(form, "fill_15_7", commonField.getOthers().get("workHighDesc"));
         /* Page12 End */
         /* Page13 Start */
-        setValueIfPresent(form, "fill_9_6", client.getSalaryCurrent());
-        setValueIfPresent(form, "fill_1k0_5", client.getSalaryLast());
-        setValueIfPresent(form, "fill_13_4", client.getBonusCurrent());
-        setValueIfPresent(form, "fill_14_4", client.getBonusLast());
-        setValueIfPresent(form, "fill_17_7", client.getCompanyInterestCurrent());
-        setValueIfPresent(form, "fill_18_6", client.getCompanyInterestLast());
-        setValueIfPresent(form, "fill_2k9_3", client.getDividendsCurrent());
-        setValueIfPresent(form, "fill_3k0_3", client.getDividendsLast());
-        setValueIfPresent(form, "fill_k33_3", client.getRentalsCurrent());
-        setValueIfPresent(form, "fill_34_2", client.getRentalsLast());
-        setValueIfPresent(form, "fill_k37_2", client.getOtherUnearnedCurrent());
-        setValueIfPresent(form, "fill_38_2", client.getOtherUnearnedLast());
-        setValueIfPresent(form, "fill_37_2", client.getTotalUnearnedCurrent());
-        setValueIfPresent(form, "fill_38_222", client.getTotalUnearnedLast());
-        
-        
-        setValueIfPresent(form, "fill_1k1_5", client.getMortgageCurrent());
-        setValueIfPresent(form, "fill_12_511", client.getMortgageLast());
-        setValueIfPresent(form, "fill_15_8", client.getRentalsCurrent());
-        setValueIfPresent(form, "fill_16_7", client.getRentalsLast());
-        setValueIfPresent(form, "fill_19_4", client.getSchoolingCurrent());
-        setValueIfPresent(form, "fill_2k0_4", client.getSchoolingLast());
-        setValueIfPresent(form, "fill_2k3_5", client.getMembershipsCurrent());
-        setValueIfPresent(form, "fill_24_5", client.getMembershipsLast());
-        setValueIfPresent(form, "fill_3k1_3", addNums(client.getOtherExpenditureCurrent(), client.getOtherPrefFinanceCurrent()));
-        setValueIfPresent(form, "fill_32_2", addNums(client.getOtherExpenditureLast(), client.getOtherPrefFinanceLast()));
-        setValueIfPresent(form, "fill_35_2", client.getInterestCurrent());
-        setValueIfPresent(form, "fill_36_2", client.getInterestLast());
-        setValueIfPresent(form, "fill_39_212", client.getPrincipalCurrent());
-        setValueIfPresent(form, "fill_36_2", client.getPrincipalLast());
-        setValueIfPresent(form, "fill_39_2", client.getTotalExpenditureCurrent());
-        setValueIfPresent(form, "fill_40", client.getTotalExpenditureLast());
-
-        setValueIfPresent(form, "fill_4114", client.getCashDepositsCurrent());
-        setValueIfPresent(form, "fill_4215", client.getCashDepositsLast());
-        setValueIfPresent(form, "fill_5318", client.getPersonalPropertiesCurrent());
-        setValueIfPresent(form, "fill_5419", client.getPersonalPropertiesLast());
-        setValueIfPresent(form, "fill_5720", client.getInvestmentsCurrent());
-        setValueIfPresent(form, "fill_5419", client.getInvestmentsLast());
-        setValueIfPresent(form, "fill_6123", client.getOtherLiquidCurrent());
-        setValueIfPresent(form, "fill_6224", client.getOtherLiquidLast());
-        setValueIfPresent(form, "fill_6526", client.getOtherNonLiquidCurrent());
-        setValueIfPresent(form, "fill_6627", client.getOtherNonLiquidLast());
-        setValueIfPresent(form, "fill_6928", client.getNetBusinessInterestCurrent());
-        setValueIfPresent(form, "fill_7029", client.getNetBusinessInterestLast());
-        setValueIfPresent(form, "fill_111130", client.getTotalAssetsCurrent());
-        setValueIfPresent(form, "fill_111231", client.getTotalAssetsLast());
-
-        setValueIfPresent(form, "fill_41", client.getPersonalLoansCurrent());
-        setValueIfPresent(form, "fill_42", client.getPersonalLoansLast());
-        setValueIfPresent(form, "fill_49", client.getMortgageCurrent());
-        setValueIfPresent(form, "fill_50", client.getMortgageLast());
-        setValueIfPresent(form, "fill_53", client.getMarginAccountCurrent());
-        setValueIfPresent(form, "fill_54", client.getMarginAccountLast());
-        setValueIfPresent(form, "fill_57", client.getLoanGuaranteesCurrent());
-        setValueIfPresent(form, "fill_58", client.getLoanGuaranteesLast());
-        setValueIfPresent(form, "fill_61", client.getBankingFacilityCurrent());
-        setValueIfPresent(form, "fill_62", client.getBankingFacilityLast());
+        setValueIfPresent(form, "fill_9_6", formatNum(client.getSalaryCurrent()));
+        setValueIfPresent(form, "fill_1k0_5", formatNum(client.getSalaryLast()));
+        setValueIfPresent(form, "fill_13_4", formatNum(client.getBonusCurrent()));
+        setValueIfPresent(form, "fill_14_4", formatNum(client.getBonusLast()));
+        setValueIfPresent(form, "fill_17_7", formatNum(client.getCompanyInterestCurrent()));
+        setValueIfPresent(form, "fill_18_6", formatNum(client.getCompanyInterestLast()));
+        setValueIfPresent(form, "fill_2k9_3", formatNum(client.getDividendsCurrent()));
+        setValueIfPresent(form, "fill_3k0_3", formatNum(client.getDividendsLast()));
+        setValueIfPresent(form, "fill_k33_3", formatNum(client.getRentalsCurrent()));
+        setValueIfPresent(form, "fill_34_2", formatNum(client.getRentalsLast()));
+        setValueIfPresent(form, "fill_k37_2", formatNum(client.getOtherUnearnedCurrent()));
+        setValueIfPresent(form, "fill_38_2", formatNum(client.getOtherUnearnedLast()));
+        setValueIfPresent(form, "fill_37_2", formatNum(client.getTotalUnearnedCurrent()));
+        setValueIfPresent(form, "fill_38_222", formatNum(client.getTotalUnearnedLast()));
+        
+        
+        setValueIfPresent(form, "fill_1k1_5", formatNum(client.getMortgageCurrent()));
+        setValueIfPresent(form, "fill_12_511", formatNum(client.getMortgageLast()));
+        setValueIfPresent(form, "fill_15_8", formatNum(client.getRentCurrent()));
+        setValueIfPresent(form, "fill_16_7", formatNum(client.getRentLast()));
+        setValueIfPresent(form, "fill_19_4", formatNum(client.getSchoolingCurrent()));
+        setValueIfPresent(form, "fill_2k0_4", formatNum(client.getSchoolingLast()));
+        setValueIfPresent(form, "fill_2k3_5", formatNum(client.getMembershipsCurrent()));
+        setValueIfPresent(form, "fill_24_5", formatNum(client.getMembershipsLast()));
+        setValueIfPresent(form, "fill_3k1_3", addNums(formatNum(client.getOtherExpenditureCurrent()), formatNum(client.getOtherPrefFinanceCurrent())));
+        setValueIfPresent(form, "fill_32_2", addNums(formatNum(client.getOtherExpenditureLast()), formatNum(client.getOtherPrefFinanceLast())));
+        setValueIfPresent(form, "fill_35_2", formatNum(client.getInterestCurrent()));
+        setValueIfPresent(form, "fill_36_2", formatNum(client.getInterestLast()));
+        setValueIfPresent(form, "fill_39_212", formatNum(client.getPrincipalCurrent()));
+        setValueIfPresent(form, "fill_36_2", formatNum(client.getPrincipalLast()));
+        setValueIfPresent(form, "fill_39_2", formatNum(client.getTotalExpenditureCurrent()));
+        setValueIfPresent(form, "fill_40", formatNum(client.getTotalExpenditureLast()));
+
+        setValueIfPresent(form, "fill_4114", formatNum(client.getCashDepositsCurrent()));
+        setValueIfPresent(form, "fill_4215", formatNum(client.getCashDepositsLast()));
+        setValueIfPresent(form, "fill_5318", formatNum(client.getPersonalPropertiesCurrent()));
+        setValueIfPresent(form, "fill_5419", formatNum(client.getPersonalPropertiesLast()));
+        setValueIfPresent(form, "fill_5720", formatNum(client.getInvestmentsCurrent()));
+        setValueIfPresent(form, "fill_5419", formatNum(client.getInvestmentsLast()));
+        setValueIfPresent(form, "fill_6123", formatNum(client.getOtherLiquidCurrent()));
+        setValueIfPresent(form, "fill_6224", formatNum(client.getOtherLiquidLast()));
+        setValueIfPresent(form, "fill_6526", formatNum(client.getOtherNonLiquidCurrent()));
+        setValueIfPresent(form, "fill_6627", formatNum(client.getOtherNonLiquidLast()));
+        setValueIfPresent(form, "fill_6928", formatNum(client.getNetBusinessInterestCurrent()));
+        setValueIfPresent(form, "fill_7029", formatNum(client.getNetBusinessInterestLast()));
+        setValueIfPresent(form, "fill_111130", formatNum(client.getTotalAssetsCurrent()));
+        setValueIfPresent(form, "fill_111231", formatNum(client.getTotalAssetsLast()));
+
+        setValueIfPresent(form, "fill_41", formatNum(client.getPersonalLoansCurrent()));
+        setValueIfPresent(form, "fill_42", formatNum(client.getPersonalLoansLast()));
+        setValueIfPresent(form, "fill_49", formatNum(client.getMortgageCurrent()));
+        setValueIfPresent(form, "fill_50", formatNum(client.getMortgageLast()));
+        setValueIfPresent(form, "fill_53", formatNum(client.getMarginAccountCurrent()));
+        setValueIfPresent(form, "fill_54", formatNum(client.getMarginAccountLast()));
+        setValueIfPresent(form, "fill_57", formatNum(client.getLoanGuaranteesCurrent()));
+        setValueIfPresent(form, "fill_58", formatNum(client.getLoanGuaranteesLast()));
+        setValueIfPresent(form, "fill_61", formatNum(client.getBankingFacilityCurrent()));
+        setValueIfPresent(form, "fill_62", formatNum(client.getBankingFacilityLast()));
         //other 1
-        setValueIfPresent(form, "fill_65", client.getPrincipalCurrent());
-        setValueIfPresent(form, "fill_66", client.getPrincipalLast());
-        setValueIfPresent(form, "fill_69", client.getOtherPrefFinanceCurrent());
-        setValueIfPresent(form, "fill_70", client.getOtherPrefFinanceLast());
+        setValueIfPresent(form, "fill_65", formatNum(client.getPrincipalCurrent()));
+        setValueIfPresent(form, "fill_66", formatNum(client.getPrincipalLast()));
+        setValueIfPresent(form, "fill_69", formatNum(client.getOtherPrefFinanceCurrent()));
+        setValueIfPresent(form, "fill_70", formatNum(client.getOtherPrefFinanceLast()));
 
-        setValueIfPresent(form, "fill_1111", client.getTotalLiabilitiesCurrent());
-        setValueIfPresent(form, "fill_1112", client.getTotalLiabilitiesLast());
+        setValueIfPresent(form, "fill_1111", formatNum(client.getTotalLiabilitiesCurrent()));
+        setValueIfPresent(form, "fill_1112", formatNum(client.getTotalLiabilitiesLast()));
         
         /* Page13 End */
         /* Page14 Start */
@@ -2326,53 +2326,52 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
         setValueIfPresent(form, "7_1d", commonField.getOthers().get("businessOwnerNoEmployee"));
         /* Page10 End */
 
-        setValueIfPresent(form, "7_2a_salary", client.getSalaryCurrent());
-        setValueIfPresent(form, "7_2a_salary_24", client.getSalaryLast());
-        setValueIfPresent(form, "7_2a_bonuses", client.getBonusCurrent());
-        setValueIfPresent(form, "7_2a_bonuses_24", client.getBonusLast());
-        setValueIfPresent(form, "7_2a_company", client.getCompanyInterestCurrent());
-        setValueIfPresent(form, "7_2a_company_24", client.getCompanyInterestLast());
-        setValueIfPresent(form, "7_2a_dividends", client.getDividendsCurrent());
-        setValueIfPresent(form, "7_2a_dividends_24", client.getDividendsLast());
-        setValueIfPresent(form, "7_2a_rental", client.getRentalsCurrent());
-        setValueIfPresent(form, "7_2a_rental_24", client.getRentalsLast());
-        setValueIfPresent(form, "7_2a_other", addNums(client.getOtherEarnedCurrent(), client.getOtherUnearnedCurrent()));
-        setValueIfPresent(form, "7_2a_other_24", addNums(client.getOtherEarnedLast(),client.getOtherUnearnedLast()));
+        setValueIfPresent(form, "7_2a_salary", formatNum(client.getSalaryCurrent()));
+        setValueIfPresent(form, "7_2a_salary_24", formatNum(client.getSalaryLast()));
+        setValueIfPresent(form, "7_2a_bonuses", formatNum(client.getBonusCurrent()));
+        setValueIfPresent(form, "7_2a_bonuses_24", formatNum(client.getBonusLast()));
+        setValueIfPresent(form, "7_2a_company", formatNum(client.getCompanyInterestCurrent()));
+        setValueIfPresent(form, "7_2a_company_24", formatNum(client.getCompanyInterestLast()));
+        setValueIfPresent(form, "7_2a_dividends", formatNum(client.getDividendsCurrent()));
+        setValueIfPresent(form, "7_2a_dividends_24", formatNum(client.getDividendsLast()));
+        setValueIfPresent(form, "7_2a_rental", formatNum(client.getRentalsCurrent()));
+        setValueIfPresent(form, "7_2a_rental_24", formatNum(client.getRentalsLast()));
+        setValueIfPresent(form, "7_2a_other", addNums(formatNum(client.getOtherEarnedCurrent()), formatNum(client.getOtherUnearnedCurrent())));
+        setValueIfPresent(form, "7_2a_other_24", addNums(formatNum(client.getOtherEarnedLast()), formatNum(client.getOtherUnearnedLast())));
         
         //sum income
-        setValueIfPresent(form, "7_2a_sum", client.getTotalIncomeCurrent());
-        setValueIfPresent(form, "7_2a_sum_24", client.getTotalIncomeLast());
-        
-
-        setValueIfPresent(form, "7_2c_cash", client.getCashDepositsCurrent());
-        setValueIfPresent(form, "7_2c_cash_24", client.getCashDepositsLast());
-        setValueIfPresent(form, "7_2c_real", client.getPersonalPropertiesCurrent());
-        setValueIfPresent(form, "7_2c_real_24", client.getPersonalPropertiesLast());
-        setValueIfPresent(form, "7_2c_stocks", client.getInvestmentsCurrent());
-        setValueIfPresent(form, "7_2c_stocks_24", client.getInvestmentsLast());
-        setValueIfPresent(form, "7_2c_high", client.getPersonalPropertiesCurrent());
-        setValueIfPresent(form, "7_2c_high_24", client.getPersonalPropertiesLast());
-        setValueIfPresent(form, "7_2c_other", addNums(client.getOtherLiquidCurrent(), client.getOtherNonLiquidCurrent()));
-        setValueIfPresent(form, "7_2c_other_24", addNums(client.getOtherLiquidLast(), client.getOtherNonLiquidLast()));
+        setValueIfPresent(form, "7_2a_sum", formatNum(client.getTotalIncomeCurrent()));
+        setValueIfPresent(form, "7_2a_sum_24", formatNum(client.getTotalIncomeLast()));
+
+        setValueIfPresent(form, "7_2c_cash", formatNum(client.getCashDepositsCurrent()));
+        setValueIfPresent(form, "7_2c_cash_24", formatNum(client.getCashDepositsLast()));
+        setValueIfPresent(form, "7_2c_real", formatNum(client.getPersonalPropertiesCurrent()));
+        setValueIfPresent(form, "7_2c_real_24", formatNum(client.getPersonalPropertiesLast()));
+        setValueIfPresent(form, "7_2c_stocks", formatNum(client.getInvestmentsCurrent()));
+        setValueIfPresent(form, "7_2c_stocks_24", formatNum(client.getInvestmentsLast()));
+        setValueIfPresent(form, "7_2c_high", formatNum(client.getPersonalPropertiesCurrent()));
+        setValueIfPresent(form, "7_2c_high_24", formatNum(client.getPersonalPropertiesLast()));
+        setValueIfPresent(form, "7_2c_other", addNums(formatNum(client.getOtherLiquidCurrent()), formatNum(client.getOtherNonLiquidCurrent())));
+        setValueIfPresent(form, "7_2c_other_24", addNums(formatNum(client.getOtherLiquidLast()), formatNum(client.getOtherNonLiquidLast())));
 
         //sum asset
         setValueIfPresent(form, "7_2c_total", addNums(form.getField("7_2c_cash").getValueAsString(), form.getField("7_2c_real").getValueAsString(), form.getField("7_2c_stocks").getValueAsString(), form.getField("7_2c_high").getValueAsString(), form.getField("7_2c_business").getValueAsString(), form.getField("7_2c_other").getValueAsString()));
         setValueIfPresent(form, "7_2c_total_24", addNums(form.getField("7_2c_cash_24").getValueAsString(), form.getField("7_2c_real_24").getValueAsString(), form.getField("7_2c_stocks_24").getValueAsString(), form.getField("7_2c_high_24").getValueAsString(), form.getField("7_2c_business_24").getValueAsString(), form.getField("7_2c_other_24").getValueAsString()));
 
         
-        setValueIfPresent(form, "7_2c_lia_loan", client.getPersonalLoansCurrent());
-        setValueIfPresent(form, "7_2c_lia_loan_24", client.getPersonalLoansLast());
-        setValueIfPresent(form, "7_2c_lia_mortgages", client.getMortgageCurrent());
-        setValueIfPresent(form, "7_2c_lia_mortgages", client.getMortgageLast());
-        setValueIfPresent(form, "7_2c_lia_margin", client.getMarginAccountCurrent());
-        setValueIfPresent(form, "7_2c_lia_margin_24", client.getMarginAccountLast());
-        setValueIfPresent(form, "7_2c_lia_loan", client.getLoanGuaranteesCurrent());
-        setValueIfPresent(form, "7_2c_lia_margin_24", client.getLoanGuaranteesLast());
-        setValueIfPresent(form, "7_2c_lia_banking", client.getBankingFacilityCurrent());
-        setValueIfPresent(form, "7_2c_lia_margin_24", client.getBankingFacilityLast());
+        setValueIfPresent(form, "7_2c_lia_loan", formatNum(client.getPersonalLoansCurrent()));
+        setValueIfPresent(form, "7_2c_lia_loan_24", formatNum(client.getPersonalLoansLast()));
+        setValueIfPresent(form, "7_2c_lia_mortgages", formatNum(client.getMortgageCurrent()));
+        setValueIfPresent(form, "7_2c_lia_mortgages", formatNum(client.getMortgageLast()));
+        setValueIfPresent(form, "7_2c_lia_margin", formatNum(client.getMarginAccountCurrent()));
+        setValueIfPresent(form, "7_2c_lia_margin_24", formatNum(client.getMarginAccountLast()));
+        setValueIfPresent(form, "7_2c_lia_loan", formatNum(client.getLoanGuaranteesCurrent()));
+        setValueIfPresent(form, "7_2c_lia_margin_24", formatNum(client.getLoanGuaranteesLast()));
+        setValueIfPresent(form, "7_2c_lia_banking", formatNum(client.getBankingFacilityCurrent()));
+        setValueIfPresent(form, "7_2c_lia_margin_24", formatNum(client.getBankingFacilityLast()));
         
-        setValueIfPresent(form, "7_2c_lia_other", addNums(client.getOtherPrefFinanceCurrent(), client.getPrincipalCurrent()));
-        setValueIfPresent(form, "7_2c_lia_other_24", addNums(client.getOtherPrefFinanceLast(), client.getPrincipalLast()));
+        setValueIfPresent(form, "7_2c_lia_other", addNums(formatNum(client.getOtherPrefFinanceCurrent()), formatNum(client.getPrincipalCurrent())));
+        setValueIfPresent(form, "7_2c_lia_other_24", addNums(formatNum(client.getOtherPrefFinanceLast()), formatNum(client.getPrincipalLast())));
         //sum liabilities
         setValueIfPresent(form, "7_2c_lia_total", addNums(form.getField("7_2c_lia_loan").getValueAsString(), form.getField("7_2c_lia_mortgages").getValueAsString(), form.getField("7_2c_lia_margin").getValueAsString(), form.getField("7_2c_lia_loan").getValueAsString(), form.getField("7_2c_lia_other").getValueAsString()));
         setValueIfPresent(form, "7_2c_lia_total", addNums(form.getField("7_2c_lia_loan_24").getValueAsString(), form.getField("7_2c_lia_mortgages_24").getValueAsString(), form.getField("7_2c_lia_margin_24").getValueAsString(), form.getField("7_2c_lia_loan_24").getValueAsString(), form.getField("7_2c_lia_other_24").getValueAsString()));
@@ -2787,12 +2786,14 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
 
             case "relate1_name" -> {
                 for(int i=1; i<=9; i++){
-                    commonField.getOthers().put("relate" + i + "_name", "relate" + i + "_name");
-                    commonField.getOthers().put("relate" + i + "_relationship", "relate" + i + "_relationship");
-                    commonField.getOthers().put("relate" + i + "_age", "relate" + i + "_age");
-                    commonField.getOthers().put("relate" + i + "_occ", "relate" + i + "_occ");
-                    commonField.getOthers().put("relate" + i + "_marital", "relate" + i + "_marital");
-                    commonField.getOthers().put("relate" + i + "_dep_dd", "relate" + i + "_dep_dd");
+                    if(StringUtils.trimToNull(acroForm.getField("relate" + i + "_name").getValueAsString()) != null){
+                        commonField.getOthers().put("relate" + i + "_name", acroForm.getField("relate" + i + "_name").getValueAsString());
+                        commonField.getOthers().put("relate" + i + "_relationship", acroForm.getField("relate" + i + "_relationship").getValueAsString());
+                        commonField.getOthers().put("relate" + i + "_age", acroForm.getField("relate" + i + "_age").getValueAsString());
+                        commonField.getOthers().put("relate" + i + "_occ", acroForm.getField("relate" + i + "_occ").getValueAsString());
+                        commonField.getOthers().put("relate" + i + "_marital", acroForm.getField("relate" + i + "_marital").getValueAsString());
+                        commonField.getOthers().put("relate" + i + "_dep_dd", acroForm.getField("relate" + i + "_dep_dd").getValueAsString());
+                    }
                 }
             }