no message

src/main/java/com/ffii/lioner/modules/lioner/commonField/entity/CommonField.java

@@ -1,5 +1,12 @@
 package com.ffii.lioner.modules.lioner.commonField.entity;
 
+import java.util.HashMap;
+import java.util.Map;
+
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.annotations.Type;
+import org.hibernate.type.SqlTypes;
+
 import com.ffii.core.entity.BaseEntity;
 
 import jakarta.persistence.Column;
@@ -306,12 +313,6 @@ public class CommonField extends BaseEntity<Long>{
     @Column
 	private String email;
 
-    @Column
-	private String address1;
-
-    @Column
-	private String address2;
-
     //IDA
     @Column
 	private String own_income;
@@ -346,12 +347,6 @@ public class CommonField extends BaseEntity<Long>{
     @Column
 	private String companyName;
     
-    @Column
-	private String companyAddress1;
-    
-    @Column
-	private String companyAddress2;
-
     @Column
 	private String companyNature1;
 
@@ -496,6 +491,205 @@ public class CommonField extends BaseEntity<Long>{
     @Column
 	private String insuranceCurrency3;
 
+    @Column
+	private String employed;
+
+    @Column
+	private String homemaker;
+
+    @Column
+	private String student;
+
+    @Column
+	private String investor;
+
+    @Column
+	private String retired;
+
+    @Column
+	private String employedSelf;
+
+    @Column
+	private String employedNon;
+    
+    @Column
+	private String partTime;
+
+    @Column
+	private String ultimateTotalLife;
+
+    @Column
+	private String declinedYes;
+    
+    @Column
+	private String declinedNo;
+    
+    @Column
+	private String declinedDesc;
+
+    @Column
+	private String hazardousActivity;
+
+    @Column
+	private String incomeSalary;
+
+    @Column
+	private String incomeSalaryLastYear;
+
+    @Column
+	private String incomeBonus;
+
+    @Column
+	private String incomeBonusLastYear;
+
+    @Column
+	private String incomeOther;
+
+    @Column
+	private String incomeOtherLastYear;
+
+    @Column
+	private String incomeInterest;
+
+    @Column
+	private String incomeInterestLastYear;
+
+    @Column
+	private String incomeDividents;
+
+    @Column
+	private String incomeDividentsLastYear;
+
+    @Column
+	private String incomeRentals;
+
+    @Column
+	private String incomeRentalsLastYear;
+    
+    @Column
+	private String totalAnnualIncome;
+
+    @Column
+	private String assetCash;
+
+    @Column
+	private String assetInvestment;
+
+    @Column
+	private String assetRealEstate;
+
+    @Column
+	private String assetNetBusinessInterest;
+
+    @Column
+	private String assetProperties;
+
+    @Column
+	private String liaLoan;
+
+    @Column
+	private String liaMargin;
+
+    @Column
+	private String liaLoanGurantee;
+
+    @Column
+	private String liaMortgage;
+
+    @Column
+	private String liaOther;
+    
+    @Column
+	private String realEstatePurchaseDate1;
+
+    @Column
+	private String realEstatePurchaseDate2;
+
+    @Column
+	private String realEstatePurchaseDate3;
+
+    @Column
+	private String bankruptYes;
+    
+    @Column
+	private String bankruptNo;
+
+    @Column
+	private String bankruptDesc;
+
+    @Column
+	private String replaceInsuranceYes;
+
+    @Column
+	private String replaceInsuranceNo;
+
+    /*
+
+    @Column
+	private String crAddressRoom;
+
+    @Column
+	private String crAddressFloor;
+
+    @Column
+	private String crAddressBlock;
+
+    @Column
+	private String crAddressBuilding;
+
+    @Column
+	private String crAddressStreet;
+
+    @Column
+	private String crAddressArea;
+
+    @Column
+	private String crAddressCity;
+
+    @Column
+	private String crAddressCountry;
+
+    @Column
+	private String crAddressPostalCode;
+
+    @Column
+	private String corAddressRoom;
+
+    @Column
+	private String corAddressFloor;
+
+    @Column
+	private String corAddressBlock;
+
+    @Column
+	private String corAddressBuilding;
+
+    @Column
+	private String corAddressStreet;
+
+    @Column
+	private String corAddressArea;
+
+    @Column
+	private String corAddressCity;
+
+    @Column
+	private String corAddressCountry;
+
+    @Column
+	private String corAddressPostalCode;
+    
+    */
+
+    @Column
+	private String tobarccoYes;
+
+    @Column
+	private String tobarccoNo;
+
+    @Column(columnDefinition = "json")
+    @JdbcTypeCode(SqlTypes.JSON)
+    private Map<String, String> others = new HashMap<>();
 
     //this is a logical field
     @Column
@@ -1287,22 +1481,6 @@ public class CommonField extends BaseEntity<Long>{
         this.email = email;
     }
 
-    public String getAddress1() {
-        return address1;
-    }
-
-    public void setAddress1(String address1) {
-        this.address1 = address1;
-    }
-
-    public String getAddress2() {
-        return address2;
-    }
-
-    public void setAddress2(String address2) {
-        this.address2 = address2;
-    }
-
     public String getOwn_income() {
         return own_income;
     }
@@ -1391,22 +1569,6 @@ public class CommonField extends BaseEntity<Long>{
         this.companyName = companyName;
     }
 
-    public String getCompanyAddress1() {
-        return companyAddress1;
-    }
-
-    public void setCompanyAddress1(String companyAddress1) {
-        this.companyAddress1 = companyAddress1;
-    }
-
-    public String getCompanyAddress2() {
-        return companyAddress2;
-    }
-
-    public void setCompanyAddress2(String companyAddress2) {
-        this.companyAddress2 = companyAddress2;
-    }
-
     public String getCompanyNature1() {
         return companyNature1;
     }
@@ -1790,9 +1952,382 @@ public class CommonField extends BaseEntity<Long>{
     public void setInsuranceLife3(String insuranceLife3) {
         this.insuranceLife3 = insuranceLife3;
     }
+   
+    public String getEmployed() {
+        return employed;
+    }
 
-    
+    public void setEmployed(String employed) {
+        this.employed = employed;
+    }
+
+    public String getHomemaker() {
+        return homemaker;
+    }
+
+    public void setHomemaker(String homemaker) {
+        this.homemaker = homemaker;
+    }
+
+    public String getStudent() {
+        return student;
+    }
+
+    public void setStudent(String student) {
+        this.student = student;
+    }
+
+    public String getInvestor() {
+        return investor;
+    }
+
+    public void setInvestor(String investor) {
+        this.investor = investor;
+    }
 
+    public String getRetired() {
+        return retired;
+    }
+
+    public void setRetired(String retired) {
+        this.retired = retired;
+    }
+
+    public String getEmployedSelf() {
+        return employedSelf;
+    }
+
+    public void setEmployedSelf(String employedSelf) {
+        this.employedSelf = employedSelf;
+    }
+
+    public String getEmployedNon() {
+        return employedNon;
+    }
+
+    public void setEmployedNon(String employedNon) {
+        this.employedNon = employedNon;
+    }
+
+    public String getPartTime() {
+        return partTime;
+    }
+
+    public void setPartTime(String partTime) {
+        this.partTime = partTime;
+    }
+
+    public String getUltimateTotalLife() {
+        return ultimateTotalLife;
+    }
+
+    public void setUltimateTotalLife(String ultimateTotalLife) {
+        this.ultimateTotalLife = ultimateTotalLife;
+    }
+
+    public String getDeclinedYes() {
+        return declinedYes;
+    }
+
+    public void setDeclinedYes(String declinedYes) {
+        this.declinedYes = declinedYes;
+    }
+
+    public String getDeclinedNo() {
+        return declinedNo;
+    }
+
+    public void setDeclinedNo(String declinedNo) {
+        this.declinedNo = declinedNo;
+    }
+
+    public String getDeclinedDesc() {
+        return declinedDesc;
+    }
+
+    public void setDeclinedDesc(String declinedDesc) {
+        this.declinedDesc = declinedDesc;
+    }
+
+    public String getHazardousActivity() {
+        return hazardousActivity;
+    }
+
+    public void setHazardousActivity(String hazardousActivity) {
+        this.hazardousActivity = hazardousActivity;
+    }
+
+    public String getIncomeSalary() {
+        return incomeSalary;
+    }
+
+    public void setIncomeSalary(String incomeSalary) {
+        this.incomeSalary = incomeSalary;
+    }
+
+    public String getIncomeSalaryLastYear() {
+        return incomeSalaryLastYear;
+    }
+
+    public void setIncomeSalaryLastYear(String incomeSalaryLastYear) {
+        this.incomeSalaryLastYear = incomeSalaryLastYear;
+    }
+
+    public String getIncomeBonus() {
+        return incomeBonus;
+    }
+
+    public void setIncomeBonus(String incomeBonus) {
+        this.incomeBonus = incomeBonus;
+    }
+
+    public String getIncomeBonusLastYear() {
+        return incomeBonusLastYear;
+    }
+
+    public void setIncomeBonusLastYear(String incomeBonusLastYear) {
+        this.incomeBonusLastYear = incomeBonusLastYear;
+    }
+
+    public String getIncomeOther() {
+        return incomeOther;
+    }
+
+    public void setIncomeOther(String incomeOther) {
+        this.incomeOther = incomeOther;
+    }
+
+    public String getIncomeOtherLastYear() {
+        return incomeOtherLastYear;
+    }
+
+    public void setIncomeOtherLastYear(String incomeOtherLastYear) {
+        this.incomeOtherLastYear = incomeOtherLastYear;
+    }
+
+    public String getIncomeInterest() {
+        return incomeInterest;
+    }
+
+    public void setIncomeInterest(String incomeInterest) {
+        this.incomeInterest = incomeInterest;
+    }
+
+    public String getIncomeInterestLastYear() {
+        return incomeInterestLastYear;
+    }
+
+    public void setIncomeInterestLastYear(String incomeInterestLastYear) {
+        this.incomeInterestLastYear = incomeInterestLastYear;
+    }
+
+    public String getIncomeDividents() {
+        return incomeDividents;
+    }
+
+    public void setIncomeDividents(String incomeDividents) {
+        this.incomeDividents = incomeDividents;
+    }
+
+    public String getIncomeDividentsLastYear() {
+        return incomeDividentsLastYear;
+    }
+
+    public void setIncomeDividentsLastYear(String incomeDividentsLastYear) {
+        this.incomeDividentsLastYear = incomeDividentsLastYear;
+    }
+
+    public String getIncomeRentals() {
+        return incomeRentals;
+    }
+
+    public void setIncomeRentals(String incomeRentals) {
+        this.incomeRentals = incomeRentals;
+    }
+
+    public String getIncomeRentalsLastYear() {
+        return incomeRentalsLastYear;
+    }
+
+    public void setIncomeRentalsLastYear(String incomeRentalsLastYear) {
+        this.incomeRentalsLastYear = incomeRentalsLastYear;
+    }
+
+    public String getAssetCash() {
+        return assetCash;
+    }
+
+    public void setAssetCash(String assetCash) {
+        this.assetCash = assetCash;
+    }
+
+    public String getAssetInvestment() {
+        return assetInvestment;
+    }
+
+    public void setAssetInvestment(String assetInvestment) {
+        this.assetInvestment = assetInvestment;
+    }
+
+    public String getAssetRealEstate() {
+        return assetRealEstate;
+    }
+
+    public void setAssetRealEstate(String assetRealEstate) {
+        this.assetRealEstate = assetRealEstate;
+    }
+
+    public String getAssetNetBusinessInterest() {
+        return assetNetBusinessInterest;
+    }
+
+    public void setAssetNetBusinessInterest(String assetNetBusinessInterest) {
+        this.assetNetBusinessInterest = assetNetBusinessInterest;
+    }
+
+    public String getAssetProperties() {
+        return assetProperties;
+    }
+
+    public void setAssetProperties(String assetProperties) {
+        this.assetProperties = assetProperties;
+    }
+
+    public String getLiaLoan() {
+        return liaLoan;
+    }
+
+    public void setLiaLoan(String liaLoan) {
+        this.liaLoan = liaLoan;
+    }
+
+    public String getLiaMargin() {
+        return liaMargin;
+    }
+
+    public void setLiaMargin(String liaMargin) {
+        this.liaMargin = liaMargin;
+    }
+
+    public String getLiaLoanGurantee() {
+        return liaLoanGurantee;
+    }
+
+    public void setLiaLoanGurantee(String liaLoanGurantee) {
+        this.liaLoanGurantee = liaLoanGurantee;
+    }
+
+    public String getLiaMortgage() {
+        return liaMortgage;
+    }
+
+    public void setLiaMortgage(String liaMortgage) {
+        this.liaMortgage = liaMortgage;
+    }
+
+    public String getLiaOther() {
+        return liaOther;
+    }
+
+    public void setLiaOther(String liaOther) {
+        this.liaOther = liaOther;
+    }
+
+    public String getTotalAnnualIncome() {
+        return totalAnnualIncome;
+    }
+
+    public void setTotalAnnualIncome(String totalAnnualIncome) {
+        this.totalAnnualIncome = totalAnnualIncome;
+    }
+
+    public String getRealEstatePurchaseDate1() {
+        return realEstatePurchaseDate1;
+    }
+
+    public void setRealEstatePurchaseDate1(String realEstatePurchaseDate1) {
+        this.realEstatePurchaseDate1 = realEstatePurchaseDate1;
+    }
+
+    public String getRealEstatePurchaseDate2() {
+        return realEstatePurchaseDate2;
+    }
+
+    public void setRealEstatePurchaseDate2(String realEstatePurchaseDate2) {
+        this.realEstatePurchaseDate2 = realEstatePurchaseDate2;
+    }
+
+    public String getRealEstatePurchaseDate3() {
+        return realEstatePurchaseDate3;
+    }
+
+    public void setRealEstatePurchaseDate3(String realEstatePurchaseDate3) {
+        this.realEstatePurchaseDate3 = realEstatePurchaseDate3;
+    }
+
+    public String getBankruptYes() {
+        return bankruptYes;
+    }
+
+    public void setBankruptYes(String bankruptYes) {
+        this.bankruptYes = bankruptYes;
+    }
+
+    public String getBankruptNo() {
+        return bankruptNo;
+    }
+
+    public void setBankruptNo(String bankruptNo) {
+        this.bankruptNo = bankruptNo;
+    }
+
+    public String getBankruptDesc() {
+        return bankruptDesc;
+    }
+
+    public void setBankruptDesc(String bankruptDesc) {
+        this.bankruptDesc = bankruptDesc;
+    }
+
+    public String getTobarccoYes() {
+        return tobarccoYes;
+    }
+
+    public void setTobarccoYes(String tobarccoYes) {
+        this.tobarccoYes = tobarccoYes;
+    }
+
+    public String getReplaceInsuranceYes() {
+        return replaceInsuranceYes;
+    }
+
+    public void setReplaceInsuranceYes(String replaceInsuranceYes) {
+        this.replaceInsuranceYes = replaceInsuranceYes;
+    }
+
+    public String getReplaceInsuranceNo() {
+        return replaceInsuranceNo;
+    }
+
+    public void setReplaceInsuranceNo(String replaceInsuranceNo) {
+        this.replaceInsuranceNo = replaceInsuranceNo;
+    }
+
+    public String getTobarccoNo() {
+        return tobarccoNo;
+    }
+
+    public void setTobarccoNo(String tobarccoNo) {
+        this.tobarccoNo = tobarccoNo;
+    }
+
+    public Map<String, String> getOthers() {
+        return others;
+    }
+
+    public void setOthers(Map<String, String> others) {
+        this.others = others;
+    }
 
     
 }

src/main/java/com/ffii/lioner/modules/lioner/template/service/TemplateService.java

@@ -1,41 +1,26 @@
 package com.ffii.lioner.modules.lioner.template.service;
 
-import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
-
-import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
-import com.ffii.lioner.modules.lioner.template.entity.Template;
-import com.ffii.lioner.modules.lioner.template.entity.TemplateRepository;
-import com.ffii.lioner.modules.lioner.commonField.entity.CommonField;
-import com.ffii.lioner.modules.lioner.commonField.service.CommonFieldService;
-import com.ffii.lioner.modules.lioner.entity.ImpEvent;
-import com.ffii.lioner.modules.lioner.template.req.UpdateTemplateReq;
-import com.ffii.lioner.modules.lioner.service.FileService;
-import com.ffii.lioner.modules.common.SecurityUtils;
-import com.ffii.lioner.modules.common.service.AuditLogService;
-import com.ffii.lioner.modules.master.entity.SubDivision;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.ffii.core.exception.NotFoundException;
 import com.ffii.core.exception.UnprocessableEntityException;
 import com.ffii.core.support.AbstractBaseEntityService;
 import com.ffii.core.support.JdbcDao;
 import com.ffii.core.utils.BeanUtils;
-import com.ffii.core.utils.JsonUtils;
-import com.ffii.core.utils.Params;
+import com.ffii.lioner.modules.common.service.AuditLogService;
+import com.ffii.lioner.modules.lioner.service.FileService;
+import com.ffii.lioner.modules.lioner.template.entity.Template;
+import com.ffii.lioner.modules.lioner.template.entity.TemplateRepository;
+import com.ffii.lioner.modules.lioner.template.req.UpdateTemplateReq;
 
 
 @Service
@@ -163,7 +148,7 @@ public class TemplateService extends AbstractBaseEntityService<Template, Long, T
 			if (args.containsKey("createDateTo")) 
 				sql.append(" AND t.created <= :createDateTo ");
 		}
-		sql.append(" ORDER BY t.id asc ");
+		sql.append(" order by name like 'SL%', name like 'ML%', name like 'HSBC%' , name like 'Lioner%' ");
 
 		return jdbcDao.queryForList(sql.toString(), args);
 	}

src/main/resources/db/changelog/changes/17_edit_common_fields/01_drop_and_create.sql

@@ -0,0 +1,229 @@
+--liquibase formatted sql
+
+--changeset vin:drop and create common fields
+
+DROP TABLE IF EXISTS `common_field`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `common_field` (
+  `id` int NOT NULL AUTO_INCREMENT,
+  `created` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `createdBy` varchar(30) DEFAULT NULL,
+  `version` int NOT NULL DEFAULT '0',
+  `modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `modifiedBy` varchar(30) DEFAULT NULL,
+  `deleted` tinyint(1) NOT NULL DEFAULT '0',
+  `clientId` bigint NOT NULL,
+  `name` varchar(50) DEFAULT NULL,
+  `dateOfBirth` varchar(30) DEFAULT NULL,
+  `idCard` varchar(30) DEFAULT NULL,
+  `occupation` varchar(50) DEFAULT NULL,
+  `firstName` varchar(50) DEFAULT NULL,
+  `genderMale` varchar(10) DEFAULT NULL,
+  `genderFemale` varchar(10) DEFAULT NULL,
+  `givenName` varchar(50) DEFAULT NULL,
+  `ddDateOfBirth` varchar(10) DEFAULT NULL,
+  `mmDateOfBirth` varchar(10) DEFAULT NULL,
+  `yyyyDateOfBirth` varchar(10) DEFAULT NULL,
+  `nameChi` varchar(50) DEFAULT NULL,
+  `gender` varchar(10) DEFAULT NULL,
+  `maritalStatus` varchar(20) DEFAULT NULL,
+  `noOfDependents` varchar(20) DEFAULT NULL,
+  `fna_c1a_amount` varchar(45) DEFAULT NULL,
+  `fna_c1b_amount` varchar(45) DEFAULT NULL,
+  `fna_c1c_1_amount` varchar(45) DEFAULT NULL,
+  `fna_c1c_2_amount` varchar(45) DEFAULT NULL,
+  `fna_c1c_3_amount` varchar(45) DEFAULT NULL,
+  `fna_c1d_amount` varchar(45) DEFAULT NULL,
+  `fna_c2a_amount` varchar(45) DEFAULT NULL,
+  `fna_c2b_amount` varchar(45) DEFAULT NULL,
+  `fna_c2c_amount` varchar(45) DEFAULT NULL,
+  `fna_c2d_amount` varchar(45) DEFAULT NULL,
+  `fna_c2e_amount` varchar(45) DEFAULT NULL,
+  `fna_b1_a` varchar(10) DEFAULT NULL,
+  `fna_b1_a_amount` varchar(45) DEFAULT NULL,
+  `fna_b1_b` varchar(10) DEFAULT NULL,
+  `fna_b1a_4_amount` varchar(45) DEFAULT NULL,
+  `fna_b1_c` varchar(10) DEFAULT NULL,
+  `fna_b1_d` varchar(10) DEFAULT NULL,
+  `fna_b1_d_year` varchar(30) DEFAULT NULL,
+  `fna_b1_d_amount` varchar(45) DEFAULT NULL,
+  `fna_b1_e` varchar(10) DEFAULT NULL,
+  `fna_b1_f` varchar(10) DEFAULT NULL,
+  `fna_b1_f_other` varchar(45) DEFAULT NULL,
+  `fna_b1_f_desc` varchar(45) DEFAULT NULL,
+  `fna_b1b_1` varchar(10) DEFAULT NULL,
+  `fna_b1b_2` varchar(10) DEFAULT NULL,
+  `fna_b1b_3` varchar(10) DEFAULT NULL,
+  `fna_b2_a` varchar(10) DEFAULT NULL,
+  `fna_b2_b` varchar(10) DEFAULT NULL,
+  `fna_b2_c` varchar(10) DEFAULT NULL,
+  `fna_b2_d` varchar(10) DEFAULT NULL,
+  `fna_b2_e` varchar(10) DEFAULT NULL,
+  `fna_b2_f` varchar(10) DEFAULT NULL,
+  `fna_b2_g` varchar(10) DEFAULT NULL,
+  `fna_c3a_2_5` varchar(10) DEFAULT NULL,
+  `fna_c3a_6_10` varchar(10) DEFAULT NULL,
+  `fna_c3a_11_15` varchar(10) DEFAULT NULL,
+  `fna_c3a_16_20` varchar(10) DEFAULT NULL,
+  `fna_c3a_20` varchar(10) DEFAULT NULL,
+  `fna_c3a_life` varchar(10) DEFAULT NULL,
+  `fna_c3a_single_pay` varchar(10) DEFAULT NULL,
+  `fna_a_retire` varchar(20) DEFAULT NULL,
+  `fna_c3b_salary` varchar(10) DEFAULT NULL,
+  `fna_c3b_income` varchar(10) DEFAULT NULL,
+  `fna_c3b_saving` varchar(10) DEFAULT NULL,
+  `fna_c3b_investments` varchar(10) DEFAULT NULL,
+  `fna_c3b_policy` varchar(10) DEFAULT NULL,
+  `fna_c3b_others` varchar(45) DEFAULT NULL,
+  `fna_c3b_desc` varchar(45) DEFAULT NULL,
+  `fna_c3c_yes` varchar(10) DEFAULT NULL,
+  `fna_c3c_no` varchar(10) DEFAULT NULL,
+  `fna_c1e_10` varchar(10) DEFAULT NULL,
+  `fna_c1e_10_20` varchar(10) DEFAULT NULL,
+  `fna_c1e_21_30` varchar(10) DEFAULT NULL,
+  `fna_c1e_31_40` varchar(10) DEFAULT NULL,
+  `fna_c1e_41_50` varchar(10) DEFAULT NULL,
+  `fna_c1e_50` varchar(10) DEFAULT NULL,
+  `fna_c2f_10` varchar(10) DEFAULT NULL,
+  `fna_c2f_10_20` varchar(10) DEFAULT NULL,
+  `fna_c2f_21_30` varchar(10) DEFAULT NULL,
+  `fna_c2f_31_40` varchar(10) DEFAULT NULL,
+  `fna_c2f_41_50` varchar(10) DEFAULT NULL,
+  `fna_c2f_50` varchar(10) DEFAULT NULL,
+  `contactNo` varchar(45) DEFAULT NULL,
+  `eduPri` varchar(10) DEFAULT NULL,
+  `eduSec` varchar(10) DEFAULT NULL,
+  `eduPostSec` varchar(10) DEFAULT NULL,
+  `own_income` varchar(10) DEFAULT NULL,
+  `savings` varchar(10) DEFAULT NULL,
+  `premium_financing` varchar(10) DEFAULT NULL,
+  `others_funds` varchar(10) DEFAULT NULL,
+  `others_funds_desc` varchar(45) DEFAULT NULL,
+  `fna_a_life_0` varchar(10) DEFAULT NULL,
+  `fna_a_life_less_5` varchar(10) DEFAULT NULL,
+  `fna_a_life_above_5` varchar(10) DEFAULT NULL,
+  `fna_c2a_cash` varchar(10) DEFAULT NULL,
+  `fna_c2a_market_account` varchar(10) DEFAULT NULL,
+  `fna_c2a_bank_account` varchar(10) DEFAULT NULL,
+  `fna_c2a_bonds` varchar(10) DEFAULT NULL,
+  `fna_c2a_stocks` varchar(10) DEFAULT NULL,
+  `fna_c2a_us` varchar(10) DEFAULT NULL,
+  `fna_c2a_others` varchar(45) DEFAULT NULL,
+  `fna_c2a_desc` varchar(45) DEFAULT NULL,
+  `fna_d_1` varchar(10) DEFAULT NULL,
+  `fna_d_2` varchar(10) DEFAULT NULL,
+  `fna_d_3` varchar(10) DEFAULT NULL,
+  `fna_d_desc` varchar(45) DEFAULT NULL,
+  `email` varchar(45) DEFAULT NULL,
+  `address1` varchar(100) DEFAULT NULL,
+  `address2` varchar(100) DEFAULT NULL,
+  `placeOfBirth` varchar(30) DEFAULT NULL,
+  `countryOfIssue` varchar(30) DEFAULT NULL,
+  `countryOfCitizenship` varchar(30) DEFAULT NULL,
+  `passportNo` varchar(50) DEFAULT NULL,
+  `occupationTitle` varchar(50) DEFAULT NULL,
+  `companyName` varchar(100) DEFAULT NULL,
+  `companyAddress1` varchar(100) DEFAULT NULL,
+  `companyAddress2` varchar(100) DEFAULT NULL,
+  `companyNature1` varchar(60) DEFAULT NULL,
+  `companyNature2` varchar(60) DEFAULT NULL,
+  `taxResidency1` varchar(60) DEFAULT NULL,
+  `taxResidency2` varchar(60) DEFAULT NULL,
+  `taxResidency3` varchar(60) DEFAULT NULL,
+  `taxPin1` varchar(50) DEFAULT NULL,
+  `taxPin2` varchar(50) DEFAULT NULL,
+  `taxPin3` varchar(50) DEFAULT NULL,
+  `taxReason1` varchar(45) DEFAULT NULL,
+  `taxReason2` varchar(45) DEFAULT NULL,
+  `taxReason3` varchar(45) DEFAULT NULL,
+  `taxReasonB1` varchar(50) DEFAULT NULL,
+  `taxReasonB2` varchar(50) DEFAULT NULL,
+  `taxReasonB3` varchar(50) DEFAULT NULL,
+  `eduUni` varchar(45) DEFAULT NULL,
+  `insuranceCompany1_1` varchar(60) DEFAULT NULL,
+  `insuranceCompany1_2` varchar(60) DEFAULT NULL,
+  `insuranceCompany1_3` varchar(60) DEFAULT NULL,
+  `insuranceCompany2_1` varchar(60) DEFAULT NULL,
+  `insuranceCompany2_2` varchar(60) DEFAULT NULL,
+  `insuranceCompany2_3` varchar(60) DEFAULT NULL,
+  `insuranceCompany3_1` varchar(60) DEFAULT NULL,
+  `insuranceCompany3_2` varchar(60) DEFAULT NULL,
+  `insuranceCompany3_3` varchar(60) DEFAULT NULL,
+  `insuranceSumInsured1` varchar(30) DEFAULT NULL,
+  `insuranceSumInsured2` varchar(30) DEFAULT NULL,
+  `insuranceSumInsured3` varchar(30) DEFAULT NULL,
+  `insuranceLife1` varchar(10) DEFAULT NULL,
+  `insuranceSaving1` varchar(10) DEFAULT NULL,
+  `insuranceCritical1` varchar(10) DEFAULT NULL,
+  `insuranceOther1` varchar(10) DEFAULT NULL,
+  `insuranceOtherDesc1` varchar(50) DEFAULT NULL,
+  `insuranceLife2` varchar(10) DEFAULT NULL,
+  `insuranceSaving2` varchar(10) DEFAULT NULL,
+  `insuranceCritical2` varchar(10) DEFAULT NULL,
+  `insuranceOther2` varchar(10) DEFAULT NULL,
+  `insuranceOtherDesc2` varchar(50) DEFAULT NULL,
+  `insuranceLife3` varchar(10) DEFAULT NULL,
+  `insuranceSaving3` varchar(10) DEFAULT NULL,
+  `insuranceCritical3` varchar(10) DEFAULT NULL,
+  `insuranceOther3` varchar(10) DEFAULT NULL,
+  `insuranceOtherDesc3` varchar(50) DEFAULT NULL,
+  `insuranceYear1` varchar(20) DEFAULT NULL,
+  `insuranceYear2` varchar(20) DEFAULT NULL,
+  `insuranceYear3` varchar(20) DEFAULT NULL,
+  `insuranceCurrency1` varchar(20) DEFAULT NULL,
+  `insuranceCurrency2` varchar(20) DEFAULT NULL,
+  `insuranceCurrency3` varchar(20) DEFAULT NULL,
+  `crAddress1` varchar(100) DEFAULT NULL,
+  `crAddress2` varchar(100) DEFAULT NULL,
+  `employed` varchar(10) DEFAULT NULL,
+  `homemaker` varchar(10) DEFAULT NULL,
+  `student` varchar(10) DEFAULT NULL,
+  `investor` varchar(10) DEFAULT NULL,
+  `retired` varchar(10) DEFAULT NULL,
+  `employedSelf` varchar(10) DEFAULT NULL,
+  `employedNon` varchar(10) DEFAULT NULL,
+  `partTime` varchar(10) DEFAULT NULL,
+  `ultimateTotalLife` varchar(100) DEFAULT NULL,
+  `declinedYes` varchar(10) DEFAULT NULL,
+  `declinedNo` varchar(10) DEFAULT NULL,
+  `declinedDesc` varchar(60) DEFAULT NULL,
+  `hazardousActivity` varchar(100) DEFAULT NULL,
+  `incomeSalary` varchar(45) DEFAULT NULL,
+  `incomeSalaryLastYear` varchar(45) DEFAULT NULL,
+  `incomeBonus` varchar(45) DEFAULT NULL,
+  `incomeBonusLastYear` varchar(45) DEFAULT NULL,
+  `incomeOther` varchar(45) DEFAULT NULL,
+  `incomeOtherLastYear` varchar(45) DEFAULT NULL,
+  `incomeInterest` varchar(45) DEFAULT NULL,
+  `incomeInterestLastYear` varchar(45) DEFAULT NULL,
+  `incomeDividents` varchar(45) DEFAULT NULL,
+  `incomeDividentsLastYear` varchar(45) DEFAULT NULL,
+  `incomeRentals` varchar(45) DEFAULT NULL,
+  `incomeRentalsLastYear` varchar(45) DEFAULT NULL,
+  `totalAnnualIncome` varchar(45) DEFAULT NULL,
+  `assetCash` varchar(45) DEFAULT NULL,
+  `assetInvestment` varchar(45) DEFAULT NULL,
+  `assetRealEstate` varchar(45) DEFAULT NULL,
+  `assetNetBusinessInterest` varchar(45) DEFAULT NULL,
+  `assetProperties` varchar(45) DEFAULT NULL,
+  `liaLoan` varchar(45) DEFAULT NULL,
+  `liaMargin` varchar(45) DEFAULT NULL,
+  `liaLoanGurantee` varchar(45) DEFAULT NULL,
+  `liaMortgage` varchar(45) DEFAULT NULL,
+  `liaOther` varchar(45) DEFAULT NULL,
+  `realEstateAddress1_1` varchar(100) DEFAULT NULL,
+  `realEstateAddress1_2` varchar(100) DEFAULT NULL,
+  `realEstateAddress2_1` varchar(100) DEFAULT NULL,
+  `realEstateAddress2_2` varchar(100) DEFAULT NULL,
+  `realEstateAddress3_1` varchar(100) DEFAULT NULL,
+  `realEstateAddress3_2` varchar(100) DEFAULT NULL,
+  `realEstatePurchaseDate1` varchar(45) DEFAULT NULL,
+  `realEstatePurchaseDate2` varchar(45) DEFAULT NULL,
+  `realEstatePurchaseDate3` varchar(45) DEFAULT NULL,
+  `common_fieldcol` varchar(45) DEFAULT NULL,
+  `bankruptYes` varchar(10) DEFAULT NULL,
+  `bankruptNo` varchar(10) DEFAULT NULL,
+  `bankruptDesc` varchar(100) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8mb3 ROW_FORMAT=DYNAMIC;

src/main/resources/db/changelog/changes/18_recreatet_common_fields/01_drop_and_create.sql

@@ -0,0 +1,222 @@
+--liquibase formatted sql
+
+--changeset vin:drop and create again
+
+DROP TABLE IF EXISTS `common_field`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `common_field` (
+  `id` int NOT NULL AUTO_INCREMENT,
+  `created` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `createdBy` varchar(30) DEFAULT NULL,
+  `version` int NOT NULL DEFAULT '0',
+  `modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `modifiedBy` varchar(30) DEFAULT NULL,
+  `deleted` tinyint(1) NOT NULL DEFAULT '0',
+  `clientId` bigint NOT NULL,
+  `name` varchar(50) DEFAULT NULL,
+  `dateOfBirth` varchar(30) DEFAULT NULL,
+  `idCard` varchar(30) DEFAULT NULL,
+  `occupation` varchar(50) DEFAULT NULL,
+  `firstName` varchar(50) DEFAULT NULL,
+  `genderMale` varchar(10) DEFAULT NULL,
+  `genderFemale` varchar(10) DEFAULT NULL,
+  `givenName` varchar(50) DEFAULT NULL,
+  `ddDateOfBirth` varchar(10) DEFAULT NULL,
+  `mmDateOfBirth` varchar(10) DEFAULT NULL,
+  `yyyyDateOfBirth` varchar(10) DEFAULT NULL,
+  `nameChi` varchar(50) DEFAULT NULL,
+  `gender` varchar(10) DEFAULT NULL,
+  `maritalStatus` varchar(20) DEFAULT NULL,
+  `noOfDependents` varchar(20) DEFAULT NULL,
+  `fna_c1a_amount` varchar(45) DEFAULT NULL,
+  `fna_c1b_amount` varchar(45) DEFAULT NULL,
+  `fna_c1c_1_amount` varchar(45) DEFAULT NULL,
+  `fna_c1c_2_amount` varchar(45) DEFAULT NULL,
+  `fna_c1c_3_amount` varchar(45) DEFAULT NULL,
+  `fna_c1d_amount` varchar(45) DEFAULT NULL,
+  `fna_c2a_amount` varchar(45) DEFAULT NULL,
+  `fna_c2b_amount` varchar(45) DEFAULT NULL,
+  `fna_c2c_amount` varchar(45) DEFAULT NULL,
+  `fna_c2d_amount` varchar(45) DEFAULT NULL,
+  `fna_c2e_amount` varchar(45) DEFAULT NULL,
+  `fna_b1_a` varchar(10) DEFAULT NULL,
+  `fna_b1_a_amount` varchar(45) DEFAULT NULL,
+  `fna_b1_b` varchar(10) DEFAULT NULL,
+  `fna_b1a_4_amount` varchar(45) DEFAULT NULL,
+  `fna_b1_c` varchar(10) DEFAULT NULL,
+  `fna_b1_d` varchar(10) DEFAULT NULL,
+  `fna_b1_d_year` varchar(30) DEFAULT NULL,
+  `fna_b1_d_amount` varchar(45) DEFAULT NULL,
+  `fna_b1_e` varchar(10) DEFAULT NULL,
+  `fna_b1_f` varchar(10) DEFAULT NULL,
+  `fna_b1_f_other` varchar(45) DEFAULT NULL,
+  `fna_b1_f_desc` varchar(45) DEFAULT NULL,
+  `fna_b1b_1` varchar(10) DEFAULT NULL,
+  `fna_b1b_2` varchar(10) DEFAULT NULL,
+  `fna_b1b_3` varchar(10) DEFAULT NULL,
+  `fna_b2_a` varchar(10) DEFAULT NULL,
+  `fna_b2_b` varchar(10) DEFAULT NULL,
+  `fna_b2_c` varchar(10) DEFAULT NULL,
+  `fna_b2_d` varchar(10) DEFAULT NULL,
+  `fna_b2_e` varchar(10) DEFAULT NULL,
+  `fna_b2_f` varchar(10) DEFAULT NULL,
+  `fna_b2_g` varchar(10) DEFAULT NULL,
+  `fna_c3a_2_5` varchar(10) DEFAULT NULL,
+  `fna_c3a_6_10` varchar(10) DEFAULT NULL,
+  `fna_c3a_11_15` varchar(10) DEFAULT NULL,
+  `fna_c3a_16_20` varchar(10) DEFAULT NULL,
+  `fna_c3a_20` varchar(10) DEFAULT NULL,
+  `fna_c3a_life` varchar(10) DEFAULT NULL,
+  `fna_c3a_single_pay` varchar(10) DEFAULT NULL,
+  `fna_a_retire` varchar(20) DEFAULT NULL,
+  `fna_c3b_salary` varchar(10) DEFAULT NULL,
+  `fna_c3b_income` varchar(10) DEFAULT NULL,
+  `fna_c3b_saving` varchar(10) DEFAULT NULL,
+  `fna_c3b_investments` varchar(10) DEFAULT NULL,
+  `fna_c3b_policy` varchar(10) DEFAULT NULL,
+  `fna_c3b_others` varchar(45) DEFAULT NULL,
+  `fna_c3b_desc` varchar(45) DEFAULT NULL,
+  `fna_c3c_yes` varchar(10) DEFAULT NULL,
+  `fna_c3c_no` varchar(10) DEFAULT NULL,
+  `fna_c1e_10` varchar(10) DEFAULT NULL,
+  `fna_c1e_10_20` varchar(10) DEFAULT NULL,
+  `fna_c1e_21_30` varchar(10) DEFAULT NULL,
+  `fna_c1e_31_40` varchar(10) DEFAULT NULL,
+  `fna_c1e_41_50` varchar(10) DEFAULT NULL,
+  `fna_c1e_50` varchar(10) DEFAULT NULL,
+  `fna_c2f_10` varchar(10) DEFAULT NULL,
+  `fna_c2f_10_20` varchar(10) DEFAULT NULL,
+  `fna_c2f_21_30` varchar(10) DEFAULT NULL,
+  `fna_c2f_31_40` varchar(10) DEFAULT NULL,
+  `fna_c2f_41_50` varchar(10) DEFAULT NULL,
+  `fna_c2f_50` varchar(10) DEFAULT NULL,
+  `contactNo` varchar(45) DEFAULT NULL,
+  `eduPri` varchar(10) DEFAULT NULL,
+  `eduSec` varchar(10) DEFAULT NULL,
+  `eduPostSec` varchar(10) DEFAULT NULL,
+  `own_income` varchar(10) DEFAULT NULL,
+  `savings` varchar(10) DEFAULT NULL,
+  `premium_financing` varchar(10) DEFAULT NULL,
+  `others_funds` varchar(10) DEFAULT NULL,
+  `others_funds_desc` varchar(45) DEFAULT NULL,
+  `fna_a_life_0` varchar(10) DEFAULT NULL,
+  `fna_a_life_less_5` varchar(10) DEFAULT NULL,
+  `fna_a_life_above_5` varchar(10) DEFAULT NULL,
+  `fna_c2a_cash` varchar(10) DEFAULT NULL,
+  `fna_c2a_market_account` varchar(10) DEFAULT NULL,
+  `fna_c2a_bank_account` varchar(10) DEFAULT NULL,
+  `fna_c2a_bonds` varchar(10) DEFAULT NULL,
+  `fna_c2a_stocks` varchar(10) DEFAULT NULL,
+  `fna_c2a_us` varchar(10) DEFAULT NULL,
+  `fna_c2a_others` varchar(45) DEFAULT NULL,
+  `fna_c2a_desc` varchar(45) DEFAULT NULL,
+  `fna_d_1` varchar(10) DEFAULT NULL,
+  `fna_d_2` varchar(10) DEFAULT NULL,
+  `fna_d_3` varchar(10) DEFAULT NULL,
+  `fna_d_desc` varchar(45) DEFAULT NULL,
+  `email` varchar(45) DEFAULT NULL,
+  `placeOfBirth` varchar(30) DEFAULT NULL,
+  `countryOfIssue` varchar(30) DEFAULT NULL,
+  `countryOfCitizenship` varchar(30) DEFAULT NULL,
+  `passportNo` varchar(50) DEFAULT NULL,
+  `occupationTitle` varchar(50) DEFAULT NULL,
+  `companyName` varchar(100) DEFAULT NULL,
+  `companyNature1` varchar(60) DEFAULT NULL,
+  `companyNature2` varchar(60) DEFAULT NULL,
+  `taxResidency1` varchar(60) DEFAULT NULL,
+  `taxResidency2` varchar(60) DEFAULT NULL,
+  `taxResidency3` varchar(60) DEFAULT NULL,
+  `taxPin1` varchar(50) DEFAULT NULL,
+  `taxPin2` varchar(50) DEFAULT NULL,
+  `taxPin3` varchar(50) DEFAULT NULL,
+  `taxReason1` varchar(45) DEFAULT NULL,
+  `taxReason2` varchar(45) DEFAULT NULL,
+  `taxReason3` varchar(45) DEFAULT NULL,
+  `taxReasonB1` varchar(50) DEFAULT NULL,
+  `taxReasonB2` varchar(50) DEFAULT NULL,
+  `taxReasonB3` varchar(50) DEFAULT NULL,
+  `eduUni` varchar(45) DEFAULT NULL,
+  `insuranceCompany1_1` varchar(60) DEFAULT NULL,
+  `insuranceCompany1_2` varchar(60) DEFAULT NULL,
+  `insuranceCompany1_3` varchar(60) DEFAULT NULL,
+  `insuranceCompany2_1` varchar(60) DEFAULT NULL,
+  `insuranceCompany2_2` varchar(60) DEFAULT NULL,
+  `insuranceCompany2_3` varchar(60) DEFAULT NULL,
+  `insuranceCompany3_1` varchar(60) DEFAULT NULL,
+  `insuranceCompany3_2` varchar(60) DEFAULT NULL,
+  `insuranceCompany3_3` varchar(60) DEFAULT NULL,
+  `insuranceSumInsured1` varchar(30) DEFAULT NULL,
+  `insuranceSumInsured2` varchar(30) DEFAULT NULL,
+  `insuranceSumInsured3` varchar(30) DEFAULT NULL,
+  `insuranceLife1` varchar(10) DEFAULT NULL,
+  `insuranceSaving1` varchar(10) DEFAULT NULL,
+  `insuranceCritical1` varchar(10) DEFAULT NULL,
+  `insuranceOther1` varchar(10) DEFAULT NULL,
+  `insuranceOtherDesc1` varchar(50) DEFAULT NULL,
+  `insuranceLife2` varchar(10) DEFAULT NULL,
+  `insuranceSaving2` varchar(10) DEFAULT NULL,
+  `insuranceCritical2` varchar(10) DEFAULT NULL,
+  `insuranceOther2` varchar(10) DEFAULT NULL,
+  `insuranceOtherDesc2` varchar(50) DEFAULT NULL,
+  `insuranceLife3` varchar(10) DEFAULT NULL,
+  `insuranceSaving3` varchar(10) DEFAULT NULL,
+  `insuranceCritical3` varchar(10) DEFAULT NULL,
+  `insuranceOther3` varchar(10) DEFAULT NULL,
+  `insuranceOtherDesc3` varchar(50) DEFAULT NULL,
+  `insuranceYear1` varchar(20) DEFAULT NULL,
+  `insuranceYear2` varchar(20) DEFAULT NULL,
+  `insuranceYear3` varchar(20) DEFAULT NULL,
+  `insuranceCurrency1` varchar(20) DEFAULT NULL,
+  `insuranceCurrency2` varchar(20) DEFAULT NULL,
+  `insuranceCurrency3` varchar(20) DEFAULT NULL,
+  `employed` varchar(10) DEFAULT NULL,
+  `homemaker` varchar(10) DEFAULT NULL,
+  `student` varchar(10) DEFAULT NULL,
+  `investor` varchar(10) DEFAULT NULL,
+  `retired` varchar(10) DEFAULT NULL,
+  `employedSelf` varchar(10) DEFAULT NULL,
+  `employedNon` varchar(10) DEFAULT NULL,
+  `partTime` varchar(10) DEFAULT NULL,
+  `ultimateTotalLife` varchar(100) DEFAULT NULL,
+  `declinedYes` varchar(10) DEFAULT NULL,
+  `declinedNo` varchar(10) DEFAULT NULL,
+  `declinedDesc` varchar(60) DEFAULT NULL,
+  `hazardousActivity` varchar(100) DEFAULT NULL,
+  `incomeSalary` varchar(45) DEFAULT NULL,
+  `incomeSalaryLastYear` varchar(45) DEFAULT NULL,
+  `incomeBonus` varchar(45) DEFAULT NULL,
+  `incomeBonusLastYear` varchar(45) DEFAULT NULL,
+  `incomeOther` varchar(45) DEFAULT NULL,
+  `incomeOtherLastYear` varchar(45) DEFAULT NULL,
+  `incomeInterest` varchar(45) DEFAULT NULL,
+  `incomeInterestLastYear` varchar(45) DEFAULT NULL,
+  `incomeDividents` varchar(45) DEFAULT NULL,
+  `incomeDividentsLastYear` varchar(45) DEFAULT NULL,
+  `incomeRentals` varchar(45) DEFAULT NULL,
+  `incomeRentalsLastYear` varchar(45) DEFAULT NULL,
+  `totalAnnualIncome` varchar(45) DEFAULT NULL,
+  `assetCash` varchar(45) DEFAULT NULL,
+  `assetInvestment` varchar(45) DEFAULT NULL,
+  `assetRealEstate` varchar(45) DEFAULT NULL,
+  `assetNetBusinessInterest` varchar(45) DEFAULT NULL,
+  `assetProperties` varchar(45) DEFAULT NULL,
+  `liaLoan` varchar(45) DEFAULT NULL,
+  `liaMargin` varchar(45) DEFAULT NULL,
+  `liaLoanGurantee` varchar(45) DEFAULT NULL,
+  `liaMortgage` varchar(45) DEFAULT NULL,
+  `liaOther` varchar(45) DEFAULT NULL,
+  `realEstatePurchaseDate1` varchar(45) DEFAULT NULL,
+  `realEstatePurchaseDate2` varchar(45) DEFAULT NULL,
+  `realEstatePurchaseDate3` varchar(45) DEFAULT NULL,
+  `common_fieldcol` varchar(45) DEFAULT NULL,
+  `bankruptYes` varchar(10) DEFAULT NULL,
+  `bankruptNo` varchar(10) DEFAULT NULL,
+  `bankruptDesc` varchar(100) DEFAULT NULL,
+  `replaceInsuranceYes` varchar(10) DEFAULT NULL,
+  `replaceInsuranceNo` varchar(10) DEFAULT NULL,
+  `tobarccoYes` varchar(10) DEFAULT NULL,
+  `tobarccoNo` varchar(10) DEFAULT NULL,
+  `others` json DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb3 ROW_FORMAT=DYNAMIC;