diff --git a/src/main/java/com/ffii/lioner/modules/lioner/client/service/ClientService.java b/src/main/java/com/ffii/lioner/modules/lioner/client/service/ClientService.java index 3c37637..09c726d 100644 --- a/src/main/java/com/ffii/lioner/modules/lioner/client/service/ClientService.java +++ b/src/main/java/com/ffii/lioner/modules/lioner/client/service/ClientService.java @@ -211,19 +211,6 @@ public class ClientService extends AbstractBaseEntityService= :dobFrom "); - // if (args.containsKey("dobTo")) - // sql.append(" AND dob <= :dobTo "); - - // if (args.containsKey("keyword")){ - // sql.append(" AND ( createdBy LIKE :keyword "); - // sql.append(" OR u.username LIKE :keyword "); - // sql.append(" OR u.fullname LIKE :keyword "); - // sql.append(" OR u.email LIKE :keyword "); - // sql.append(" OR sd.name LIKE :keyword "); - // sql.append(" OR d.name LIKE :keyword "); - // sql.append(" OR e.name LIKE :keyword) "); } - - // } - // sql.append(" ORDER BY id desc "); return jdbcDao.queryForList(sql.toString(), args); } 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 6f0cabe..752c7d3 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 @@ -403,9 +403,9 @@ public class PdfService extends AbstractBaseEntityService 0){ + // setValueIfPresent(form2, "part2_1c", commonField.getFna_b1_a()); + //} // exported year? only can one way from FNA b1 d year setValueIfPresent(form2, "part2_1a", commonField.getFna_b1_a()); setValueIfPresent(form2, "part2_1b", commonField.getFna_b1_c()); @@ -1151,10 +1152,20 @@ public class PdfService extends AbstractBaseEntityService 0){ + setValueIfPresent(form2, "part3_3_5_2a", "Yes"); + } + if(convertStringToNum(client.getInvestmentsCurrent()) > 0){ + setValueIfPresent(form2, "part3_3_5_2b", "Yes"); + } + if(convertStringToNum(client.getOtherLiquidCurrent()) > 0){ + setValueIfPresent(form2, "part3_3_5_2c", "Yes"); + } + + //setValueIfPresent(form2, "part3_3_5_2a", commonField.getFna_c3b_saving()); + //setValueIfPresent(form2, "part3_3_5_2b", commonField.getFna_c3b_investments()); + //setValueIfPresent(form2, "part3_3_5_2c", commonField.getFna_c3b_others()); + //setValueIfPresent(form2, "part3_3_5_2c_other", commonField.getFna_c3b_desc()); setValueIfPresent(form2, "part3_3_6_yes", commonField.getFna_c3c_yes()); setValueIfPresent(form2, "part3_3_6_no", commonField.getFna_c3c_no()); @@ -1172,8 +1183,7 @@ public class PdfService extends AbstractBaseEntityService 0){ + setValueIfPresent(form2, "cb6", "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"); + } + setValueIfPresent(form2, "chh1", commonField.getEduPri()); setValueIfPresent(form2, "chh2", commonField.getEduSec()); setValueIfPresent(form2, "chh4", commonField.getEduPostSec()); @@ -1301,7 +1321,8 @@ public class PdfService extends AbstractBaseEntityService 0 if(convertStringToNum(commonField.getFna_c1d_amount()) > 0){ - setValueIfPresent(form2, "cb4a1", "Yes"); + setValueIfPresent(form2, "cb4a2", "Yes"); + setValueIfPresent(form2, "cb4a2f", "Yes"); } setValueIfPresent(form2, "cb4b1", commonField.getFna_c2a_cash()); setValueIfPresent(form2, "cb4b2", commonField.getFna_c2a_bank_account()); @@ -1315,9 +1336,9 @@ public class PdfService extends AbstractBaseEntityService commonField.setFna_c3b_policy(fieldValue);\ } private void HSBCA31_textBox(PdfAcroForm form, CommonField commonField, Client client){ @@ -1694,7 +1727,7 @@ public class PdfService extends AbstractBaseEntityService commonField.getOthers().put("othersIdType", fieldValue); case "fill_12" -> commonField.setCountryOfIssue(fieldValue); - case "fill_14_date" -> commonField.getOthers().put("passportExpiryDate", fieldValue); + case "fill_14_dd" -> commonField.getOthers().put("passportExpiryDD", fieldValue); + case "fill_14_mm" -> commonField.getOthers().put("passportExpiryMM", fieldValue); + case "fill_14_yyyy" -> commonField.getOthers().put("passportExpiryYYYY", fieldValue); case "fill_15" -> commonField.setPlaceOfBirth(fieldValue); case "fill_16" -> commonField.setCountryOfCitizenship(fieldValue); @@ -2778,6 +2848,9 @@ public class PdfService extends AbstractBaseEntityService commonField.setFna_c3b_others(fieldValue); case "others_funds_desc" -> commonField.setFna_c3b_desc(fieldValue); + case "politicalYes" -> commonField.getOthers().put("politicalYes", fieldValue); + case "politicalNo" -> commonField.getOthers().put("politicalNo", fieldValue); + case "relate1_name" -> { for(int i=1; i<=9; i++){ if(StringUtils.trimToNull(acroForm.getField("relate" + i + "_name").getValueAsString()) != null){ @@ -2935,6 +3008,9 @@ public class PdfService extends AbstractBaseEntityService commonField.getOthers().put("replaceInsuranceDesc", fieldValue); /* Page7 End */ /* Page8 Start */ + case "toggle_1_4" -> commonField.getOthers().put("usPerson", fieldValue); + case "toggle_2_3" -> commonField.getOthers().put("usPersonNot", fieldValue); + case "employed" -> commonField.setEmployed(fieldValue); case "homemaker" -> commonField.setHomemaker(fieldValue); case "student" -> commonField.setStudent(fieldValue); @@ -2977,6 +3053,14 @@ public class PdfService extends AbstractBaseEntityService commonField.setEmployedSelf(fieldValue); + case "emp_employed" -> commonField.setEmployed(fieldValue); + case "emp_homemaker" -> commonField.setHomemaker(fieldValue); + case "emp_student" -> commonField.setStudent(fieldValue); + //case "ch1_12_housewife" -> commonField.setEmployedSelf(fieldValue); + case "emp_retired" -> commonField.setRetired(fieldValue); + case "emp1_position" -> commonField.getOthers().put("empPosition", fieldValue); case "emp1_company_name" -> commonField.getOthers().put("empCompanyName", fieldValue); case "emp1_duties" -> commonField.getOthers().put("empDuties", fieldValue); @@ -3409,10 +3493,10 @@ public class PdfService extends AbstractBaseEntityService commonField.setFna_c2a_amount(fieldValue); //need to /7.78 - case "part3_3_5_2a" -> commonField.setFna_c3b_saving(fieldValue); - case "part3_3_5_2b" -> commonField.setFna_c3b_investments(fieldValue); - case "part3_3_5_2c" -> commonField.setFna_c3b_others(fieldValue); - case "part3_3_5_2c_other" -> commonField.setFna_c3b_desc(fieldValue); + //case "part3_3_5_2a" -> commonField.setFna_c3b_saving(fieldValue); + //case "part3_3_5_2b" -> commonField.setFna_c3b_investments(fieldValue); + //case "part3_3_5_2c" -> commonField.setFna_c3b_others(fieldValue); + //case "part3_3_5_2c_other" -> commonField.setFna_c3b_desc(fieldValue); case "part3_3_6_yes" -> commonField.setFna_c3c_yes(fieldValue); case "part3_3_6_no" -> commonField.setFna_c3c_no(fieldValue); @@ -3499,8 +3583,8 @@ public class PdfService extends AbstractBaseEntityService commonField.setFna_c3a_6_10(fieldValue); case "cb4c3" -> commonField.setFna_c3a_11_15(fieldValue); case "cb4c4" -> commonField.setFna_c3a_16_20(fieldValue); - case "cb4c5" -> commonField.setFna_c3a_life(fieldValue); - case "cb4c6" -> commonField.setFna_c3a_single_pay(fieldValue); + case "cb4c5" -> commonField.setFna_c3a_20(fieldValue); + case "cb4c6" -> commonField.setFna_c3a_life(fieldValue); case "cb4d1" -> commonField.setFna_c1e_10(fieldValue); case "cb4d2" -> commonField.setFna_c1e_10_20(fieldValue);