no message

src/main/java/com/ffii/lioner/modules/lioner/pdf/service/PdfService.java

@@ -1222,7 +1222,7 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
 
         /* Page1 End */
         /* Page2 Start */
-        setValueIfPresent(form, "4a1", commonField.getFna_c1d_amount());
+        //setValueIfPresent(form, "4a1", commonField.getFna_c1d_amount());
         
         setValueIfPresent(form, "4a3", commonField.getFna_c1d_amount());
         setValueIfPresent(form, "4b1", commonField.getFna_c2a_amount());
@@ -1283,9 +1283,9 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
         if(convertStringToNum(commonField.getFna_b1_d_amount()) > 0){
             setValueIfPresent(form2, "cb6", "Yes");                                     
         }
-        if(convertStringToNum(commonField.getFna_c1d_amount()) > 0){
-            setValueIfPresent(form2, "cb4a1", "Yes");                                     
-        }
+        //if(convertStringToNum(commonField.getFna_c1d_amount()) > 0){
+        //    setValueIfPresent(form2, "cb4a1", "Yes");                                     
+        //}
         logger.info("singlePayAmount:" + commonField.getOthers().get("singlePayAmount") + " " + convertStringToNum(commonField.getOthers().get("singlePayAmount")));
         if(convertStringToNum(commonField.getOthers().get("singlePayAmount")) > 0){
             setValueIfPresent(form2, "cb4c7", "Yes");                                     
@@ -1690,8 +1690,8 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
         
     private void HSBCA31_textBox(PdfAcroForm form, CommonField commonField, Client client){
         /* Page1 Start */
-        setValueIfPresent(form, "fill_15", StringUtils.trimToEmpty(client.getFirstname()));
-        setValueIfPresent(form, "fill_16", StringUtils.trimToEmpty(client.getLastname()));
+        setValueIfPresent(form, "fill_15", StringUtils.trimToEmpty(client.getLastname()));
+        setValueIfPresent(form, "fill_16", StringUtils.trimToEmpty(client.getFirstname()));
         //setValueIfPresent(form, "applicant_name", StringUtils.trimToEmpty(StringUtils.trimToEmpty(client.getLastname()) + " " + StringUtils.trimToEmpty(client.getFirstname())));
 
         setValueIfPresent(form, "fill_17", commonField.getNameChi());
@@ -1702,11 +1702,10 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
         //    setValueIfPresent(form, "ID1", commonField.getIdCard());
         }else if("Yes".equals(commonField.getOthers().get("passportYes")) || "Yes".equals(commonField.getOthers().get("travelDocYes")) ){
             setValueIfPresent(form, "passportNo", commonField.getPassportNo());
+            setValueIfPresent(form, "Text12", commonField.getCountryOfIssue());
         }
         
-        setValueIfPresent(form, "Text12", commonField.getCountryOfIssue());
         setValueIfPresent(form, "fill_18", commonField.getDateOfBirth());
-        setValueIfPresent(form, "Text12", commonField.getCountryOfIssue());
         setValueIfPresent(form, "fill_18", commonField.getDateOfBirth());
         setValueIfPresent(form, "fill_19", commonField.getCountryOfCitizenship());
         setValueIfPresent(form, "fill_20", commonField.getPlaceOfBirth());
@@ -1997,9 +1996,9 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
         setValueIfPresent(form, "Company1", commonField.getOthers().get("empCompanyName"));
         setValueIfPresent(form, "BusinessNature1", StringUtils.trimToEmpty(commonField.getOthers().get("empNatureA")) + " " + StringUtils.trimToEmpty(commonField.getOthers().get("empNatureB")));
         setValueIfPresent(form, "Occupation1", commonField.getOthers().get("empPosition"));
-        setValueIfPresent(form, "JobNature1", StringUtils.trimToEmpty(commonField.getOthers().get("empNatureA")) + " " + StringUtils.trimToEmpty(commonField.getOthers().get("empNatureB")));
+        setValueIfPresent(form, "JobNature1", StringUtils.trimToEmpty(commonField.getOthers().get("empDuties")));
                                 
-        setValueIfPresent(form, "Income1", addNums(commonField.getIncomeSalary(), commonField.getIncomeBonus()) );
+        setValueIfPresent(form, "Income1", formatNum(client.getTotalEarnedCurrent()));
 
         setValueIfPresent(form, "Room1", client.getCrAddressRoom());
         setValueIfPresent(form, "Floor1", client.getCrAddressFloor());
@@ -3563,9 +3562,9 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
             /* Page1 End */
 
             /* Page2 Start */                        
-            case "cb4a1" -> commonField.setFna_c1d_amount(fieldValue); //need to set the check box when get                        
+            //case "cb4a1" -> commonField.setFna_c1d_amount(fieldValue); //need to set the check box when get                        
 
-            case "4a1" -> commonField.setFna_c1d_amount(fieldValue);                        
+            //case "4a1" -> commonField.setFna_c1d_amount(fieldValue);                        
             case "4b1" -> commonField.setFna_c2a_amount(fieldValue);
             
             case "cb4b1" -> commonField.setFna_c2a_cash(fieldValue);