fixed page issue -- frank

atms-dao/src/main/java/pwc/taxtech/atms/organization/entity/OrganizationDirector.java

@@ -74,7 +74,7 @@ public class OrganizationDirector extends BaseEntity implements Serializable {
      *
      * @mbg.generated
      */
-    private Boolean isExecutive;
+    private Byte isExecutive;
 
     /**
      *
@@ -83,7 +83,7 @@ public class OrganizationDirector extends BaseEntity implements Serializable {
      *
      * @mbg.generated
      */
-    private String otherRoles;
+    private Byte otherRoles;
 
     /**
      *
@@ -276,7 +276,7 @@ public class OrganizationDirector extends BaseEntity implements Serializable {
      *
      * @mbg.generated
      */
-    public Boolean getIsExecutive() {
+    public Byte getIsExecutive() {
         return isExecutive;
     }
 
@@ -288,7 +288,7 @@ public class OrganizationDirector extends BaseEntity implements Serializable {
      *
      * @mbg.generated
      */
-    public void setIsExecutive(Boolean isExecutive) {
+    public void setIsExecutive(Byte isExecutive) {
         this.isExecutive = isExecutive;
     }
 
@@ -300,7 +300,7 @@ public class OrganizationDirector extends BaseEntity implements Serializable {
      *
      * @mbg.generated
      */
-    public String getOtherRoles() {
+    public Byte getOtherRoles() {
         return otherRoles;
     }
 
@@ -312,8 +312,8 @@ public class OrganizationDirector extends BaseEntity implements Serializable {
      *
      * @mbg.generated
      */
-    public void setOtherRoles(String otherRoles) {
-        this.otherRoles = otherRoles == null ? null : otherRoles.trim();
+    public void setOtherRoles(Byte otherRoles) {
+        this.otherRoles = otherRoles;
     }
 
     /**

atms-dao/src/main/java/pwc/taxtech/atms/organization/entity/OrganizationDirectorExample.java

@@ -585,52 +585,52 @@ public class OrganizationDirectorExample {
             return (Criteria) this;
         }
 
-        public Criteria andIsExecutiveEqualTo(Boolean value) {
+        public Criteria andIsExecutiveEqualTo(Byte value) {
             addCriterion("is_executive =", value, "isExecutive");
             return (Criteria) this;
         }
 
-        public Criteria andIsExecutiveNotEqualTo(Boolean value) {
+        public Criteria andIsExecutiveNotEqualTo(Byte value) {
             addCriterion("is_executive <>", value, "isExecutive");
             return (Criteria) this;
         }
 
-        public Criteria andIsExecutiveGreaterThan(Boolean value) {
+        public Criteria andIsExecutiveGreaterThan(Byte value) {
             addCriterion("is_executive >", value, "isExecutive");
             return (Criteria) this;
         }
 
-        public Criteria andIsExecutiveGreaterThanOrEqualTo(Boolean value) {
+        public Criteria andIsExecutiveGreaterThanOrEqualTo(Byte value) {
             addCriterion("is_executive >=", value, "isExecutive");
             return (Criteria) this;
         }
 
-        public Criteria andIsExecutiveLessThan(Boolean value) {
+        public Criteria andIsExecutiveLessThan(Byte value) {
             addCriterion("is_executive <", value, "isExecutive");
             return (Criteria) this;
         }
 
-        public Criteria andIsExecutiveLessThanOrEqualTo(Boolean value) {
+        public Criteria andIsExecutiveLessThanOrEqualTo(Byte value) {
             addCriterion("is_executive <=", value, "isExecutive");
             return (Criteria) this;
         }
 
-        public Criteria andIsExecutiveIn(List<Boolean> values) {
+        public Criteria andIsExecutiveIn(List<Byte> values) {
             addCriterion("is_executive in", values, "isExecutive");
             return (Criteria) this;
         }
 
-        public Criteria andIsExecutiveNotIn(List<Boolean> values) {
+        public Criteria andIsExecutiveNotIn(List<Byte> values) {
             addCriterion("is_executive not in", values, "isExecutive");
             return (Criteria) this;
         }
 
-        public Criteria andIsExecutiveBetween(Boolean value1, Boolean value2) {
+        public Criteria andIsExecutiveBetween(Byte value1, Byte value2) {
             addCriterion("is_executive between", value1, value2, "isExecutive");
             return (Criteria) this;
         }
 
-        public Criteria andIsExecutiveNotBetween(Boolean value1, Boolean value2) {
+        public Criteria andIsExecutiveNotBetween(Byte value1, Byte value2) {
             addCriterion("is_executive not between", value1, value2, "isExecutive");
             return (Criteria) this;
         }
@@ -645,62 +645,52 @@ public class OrganizationDirectorExample {
             return (Criteria) this;
         }
 
-        public Criteria andOtherRolesEqualTo(String value) {
+        public Criteria andOtherRolesEqualTo(Byte value) {
             addCriterion("other_roles =", value, "otherRoles");
             return (Criteria) this;
         }
 
-        public Criteria andOtherRolesNotEqualTo(String value) {
+        public Criteria andOtherRolesNotEqualTo(Byte value) {
             addCriterion("other_roles <>", value, "otherRoles");
             return (Criteria) this;
         }
 
-        public Criteria andOtherRolesGreaterThan(String value) {
+        public Criteria andOtherRolesGreaterThan(Byte value) {
             addCriterion("other_roles >", value, "otherRoles");
             return (Criteria) this;
         }
 
-        public Criteria andOtherRolesGreaterThanOrEqualTo(String value) {
+        public Criteria andOtherRolesGreaterThanOrEqualTo(Byte value) {
             addCriterion("other_roles >=", value, "otherRoles");
             return (Criteria) this;
         }
 
-        public Criteria andOtherRolesLessThan(String value) {
+        public Criteria andOtherRolesLessThan(Byte value) {
             addCriterion("other_roles <", value, "otherRoles");
             return (Criteria) this;
         }
 
-        public Criteria andOtherRolesLessThanOrEqualTo(String value) {
+        public Criteria andOtherRolesLessThanOrEqualTo(Byte value) {
             addCriterion("other_roles <=", value, "otherRoles");
             return (Criteria) this;
         }
 
-        public Criteria andOtherRolesLike(String value) {
-            addCriterion("other_roles like", value, "otherRoles");
-            return (Criteria) this;
-        }
-
-        public Criteria andOtherRolesNotLike(String value) {
-            addCriterion("other_roles not like", value, "otherRoles");
-            return (Criteria) this;
-        }
-
-        public Criteria andOtherRolesIn(List<String> values) {
+        public Criteria andOtherRolesIn(List<Byte> values) {
             addCriterion("other_roles in", values, "otherRoles");
             return (Criteria) this;
         }
 
-        public Criteria andOtherRolesNotIn(List<String> values) {
+        public Criteria andOtherRolesNotIn(List<Byte> values) {
             addCriterion("other_roles not in", values, "otherRoles");
             return (Criteria) this;
         }
 
-        public Criteria andOtherRolesBetween(String value1, String value2) {
+        public Criteria andOtherRolesBetween(Byte value1, Byte value2) {
             addCriterion("other_roles between", value1, value2, "otherRoles");
             return (Criteria) this;
         }
 
-        public Criteria andOtherRolesNotBetween(String value1, String value2) {
+        public Criteria andOtherRolesNotBetween(Byte value1, Byte value2) {
             addCriterion("other_roles not between", value1, value2, "otherRoles");
             return (Criteria) this;
         }

atms-dao/src/main/java/pwc/taxtech/atms/organization/entity/OrganizationHK.java

@@ -64,16 +64,16 @@ public class OrganizationHK extends BaseEntity implements Serializable {
 
     /**
      * Database Column Remarks:
-     *   0:Limited partnership
-     *   1:Limited company 
-     *   2:Trustee
+     *   1:Limited partnership
+     *   2:Limited company 
+     *   3:Trustee
      *
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column organization.legal_form
      *
      * @mbg.generated
      */
-    private String legalForm;
+    private Byte legalForm;
 
     /**
      *
@@ -161,16 +161,16 @@ public class OrganizationHK extends BaseEntity implements Serializable {
 
     /**
      * Database Column Remarks:
-     *   0:Investment fund
-     *   1:Investment holding
-     *   2:Portfolio company
+     *   1:Investment fund
+     *   2:Investment holding
+     *   3:Portfolio company
      *
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column organization.entity_level
      *
      * @mbg.generated
      */
-    private String entityLevel;
+    private Byte entityLevel;
 
     /**
      *
@@ -183,16 +183,16 @@ public class OrganizationHK extends BaseEntity implements Serializable {
 
     /**
      * Database Column Remarks:
-     *   0:Hong Kong
-     *   1:British Virgin Islands
-     *   2:Cayman Islands
+     *   1:Hong Kong
+     *   2:British Virgin Islands
+     *   3:Cayman Islands
      *
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column organization.jurisdiction_of_formation
      *
      * @mbg.generated
      */
-    private String jurisdictionOfFormation;
+    private Byte jurisdictionOfFormation;
 
     /**
      *
@@ -223,15 +223,15 @@ public class OrganizationHK extends BaseEntity implements Serializable {
 
     /**
      * Database Column Remarks:
-     *   0:Ordinary shares
-     *   1:Preference shares
+     *   1:Ordinary shares
+     *   2:Preference shares
      *
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column organization.ownership_form
      *
      * @mbg.generated
      */
-    private String ownershipForm;
+    private Byte ownershipForm;
 
     /**
      *
@@ -441,7 +441,7 @@ public class OrganizationHK extends BaseEntity implements Serializable {
      *
      * @mbg.generated
      */
-    public String getLegalForm() {
+    public Byte getLegalForm() {
         return legalForm;
     }
 
@@ -453,8 +453,8 @@ public class OrganizationHK extends BaseEntity implements Serializable {
      *
      * @mbg.generated
      */
-    public void setLegalForm(String legalForm) {
-        this.legalForm = legalForm == null ? null : legalForm.trim();
+    public void setLegalForm(Byte legalForm) {
+        this.legalForm = legalForm;
     }
 
     /**
@@ -681,7 +681,7 @@ public class OrganizationHK extends BaseEntity implements Serializable {
      *
      * @mbg.generated
      */
-    public String getEntityLevel() {
+    public Byte getEntityLevel() {
         return entityLevel;
     }
 
@@ -693,8 +693,8 @@ public class OrganizationHK extends BaseEntity implements Serializable {
      *
      * @mbg.generated
      */
-    public void setEntityLevel(String entityLevel) {
-        this.entityLevel = entityLevel == null ? null : entityLevel.trim();
+    public void setEntityLevel(Byte entityLevel) {
+        this.entityLevel = entityLevel;
     }
 
     /**
@@ -729,7 +729,7 @@ public class OrganizationHK extends BaseEntity implements Serializable {
      *
      * @mbg.generated
      */
-    public String getJurisdictionOfFormation() {
+    public Byte getJurisdictionOfFormation() {
         return jurisdictionOfFormation;
     }
 
@@ -741,8 +741,8 @@ public class OrganizationHK extends BaseEntity implements Serializable {
      *
      * @mbg.generated
      */
-    public void setJurisdictionOfFormation(String jurisdictionOfFormation) {
-        this.jurisdictionOfFormation = jurisdictionOfFormation == null ? null : jurisdictionOfFormation.trim();
+    public void setJurisdictionOfFormation(Byte jurisdictionOfFormation) {
+        this.jurisdictionOfFormation = jurisdictionOfFormation;
     }
 
     /**
@@ -825,7 +825,7 @@ public class OrganizationHK extends BaseEntity implements Serializable {
      *
      * @mbg.generated
      */
-    public String getOwnershipForm() {
+    public Byte getOwnershipForm() {
         return ownershipForm;
     }
 
@@ -837,8 +837,8 @@ public class OrganizationHK extends BaseEntity implements Serializable {
      *
      * @mbg.generated
      */
-    public void setOwnershipForm(String ownershipForm) {
-        this.ownershipForm = ownershipForm == null ? null : ownershipForm.trim();
+    public void setOwnershipForm(Byte ownershipForm) {
+        this.ownershipForm = ownershipForm;
     }
 
     /**

atms-dao/src/main/java/pwc/taxtech/atms/organization/entity/OrganizationHKExample.java

@@ -525,62 +525,52 @@ public class OrganizationHKExample {
             return (Criteria) this;
         }
 
-        public Criteria andLegalFormEqualTo(String value) {
+        public Criteria andLegalFormEqualTo(Byte value) {
             addCriterion("legal_form =", value, "legalForm");
             return (Criteria) this;
         }
 
-        public Criteria andLegalFormNotEqualTo(String value) {
+        public Criteria andLegalFormNotEqualTo(Byte value) {
             addCriterion("legal_form <>", value, "legalForm");
             return (Criteria) this;
         }
 
-        public Criteria andLegalFormGreaterThan(String value) {
+        public Criteria andLegalFormGreaterThan(Byte value) {
             addCriterion("legal_form >", value, "legalForm");
             return (Criteria) this;
         }
 
-        public Criteria andLegalFormGreaterThanOrEqualTo(String value) {
+        public Criteria andLegalFormGreaterThanOrEqualTo(Byte value) {
             addCriterion("legal_form >=", value, "legalForm");
             return (Criteria) this;
         }
 
-        public Criteria andLegalFormLessThan(String value) {
+        public Criteria andLegalFormLessThan(Byte value) {
             addCriterion("legal_form <", value, "legalForm");
             return (Criteria) this;
         }
 
-        public Criteria andLegalFormLessThanOrEqualTo(String value) {
+        public Criteria andLegalFormLessThanOrEqualTo(Byte value) {
             addCriterion("legal_form <=", value, "legalForm");
             return (Criteria) this;
         }
 
-        public Criteria andLegalFormLike(String value) {
-            addCriterion("legal_form like", value, "legalForm");
-            return (Criteria) this;
-        }
-
-        public Criteria andLegalFormNotLike(String value) {
-            addCriterion("legal_form not like", value, "legalForm");
-            return (Criteria) this;
-        }
-
-        public Criteria andLegalFormIn(List<String> values) {
+        public Criteria andLegalFormIn(List<Byte> values) {
             addCriterion("legal_form in", values, "legalForm");
             return (Criteria) this;
         }
 
-        public Criteria andLegalFormNotIn(List<String> values) {
+        public Criteria andLegalFormNotIn(List<Byte> values) {
             addCriterion("legal_form not in", values, "legalForm");
             return (Criteria) this;
         }
 
-        public Criteria andLegalFormBetween(String value1, String value2) {
+        public Criteria andLegalFormBetween(Byte value1, Byte value2) {
             addCriterion("legal_form between", value1, value2, "legalForm");
             return (Criteria) this;
         }
 
-        public Criteria andLegalFormNotBetween(String value1, String value2) {
+        public Criteria andLegalFormNotBetween(Byte value1, Byte value2) {
             addCriterion("legal_form not between", value1, value2, "legalForm");
             return (Criteria) this;
         }
@@ -1175,62 +1165,52 @@ public class OrganizationHKExample {
             return (Criteria) this;
         }
 
-        public Criteria andEntityLevelEqualTo(String value) {
+        public Criteria andEntityLevelEqualTo(Byte value) {
             addCriterion("entity_level =", value, "entityLevel");
             return (Criteria) this;
         }
 
-        public Criteria andEntityLevelNotEqualTo(String value) {
+        public Criteria andEntityLevelNotEqualTo(Byte value) {
             addCriterion("entity_level <>", value, "entityLevel");
             return (Criteria) this;
         }
 
-        public Criteria andEntityLevelGreaterThan(String value) {
+        public Criteria andEntityLevelGreaterThan(Byte value) {
             addCriterion("entity_level >", value, "entityLevel");
             return (Criteria) this;
         }
 
-        public Criteria andEntityLevelGreaterThanOrEqualTo(String value) {
+        public Criteria andEntityLevelGreaterThanOrEqualTo(Byte value) {
             addCriterion("entity_level >=", value, "entityLevel");
             return (Criteria) this;
         }
 
-        public Criteria andEntityLevelLessThan(String value) {
+        public Criteria andEntityLevelLessThan(Byte value) {
             addCriterion("entity_level <", value, "entityLevel");
             return (Criteria) this;
         }
 
-        public Criteria andEntityLevelLessThanOrEqualTo(String value) {
+        public Criteria andEntityLevelLessThanOrEqualTo(Byte value) {
             addCriterion("entity_level <=", value, "entityLevel");
             return (Criteria) this;
         }
 
-        public Criteria andEntityLevelLike(String value) {
-            addCriterion("entity_level like", value, "entityLevel");
-            return (Criteria) this;
-        }
-
-        public Criteria andEntityLevelNotLike(String value) {
-            addCriterion("entity_level not like", value, "entityLevel");
-            return (Criteria) this;
-        }
-
-        public Criteria andEntityLevelIn(List<String> values) {
+        public Criteria andEntityLevelIn(List<Byte> values) {
             addCriterion("entity_level in", values, "entityLevel");
             return (Criteria) this;
         }
 
-        public Criteria andEntityLevelNotIn(List<String> values) {
+        public Criteria andEntityLevelNotIn(List<Byte> values) {
             addCriterion("entity_level not in", values, "entityLevel");
             return (Criteria) this;
         }
 
-        public Criteria andEntityLevelBetween(String value1, String value2) {
+        public Criteria andEntityLevelBetween(Byte value1, Byte value2) {
             addCriterion("entity_level between", value1, value2, "entityLevel");
             return (Criteria) this;
         }
 
-        public Criteria andEntityLevelNotBetween(String value1, String value2) {
+        public Criteria andEntityLevelNotBetween(Byte value1, Byte value2) {
             addCriterion("entity_level not between", value1, value2, "entityLevel");
             return (Criteria) this;
         }
@@ -1305,62 +1285,52 @@ public class OrganizationHKExample {
             return (Criteria) this;
         }
 
-        public Criteria andJurisdictionOfFormationEqualTo(String value) {
+        public Criteria andJurisdictionOfFormationEqualTo(Byte value) {
             addCriterion("jurisdiction_of_formation =", value, "jurisdictionOfFormation");
             return (Criteria) this;
         }
 
-        public Criteria andJurisdictionOfFormationNotEqualTo(String value) {
+        public Criteria andJurisdictionOfFormationNotEqualTo(Byte value) {
             addCriterion("jurisdiction_of_formation <>", value, "jurisdictionOfFormation");
             return (Criteria) this;
         }
 
-        public Criteria andJurisdictionOfFormationGreaterThan(String value) {
+        public Criteria andJurisdictionOfFormationGreaterThan(Byte value) {
             addCriterion("jurisdiction_of_formation >", value, "jurisdictionOfFormation");
             return (Criteria) this;
         }
 
-        public Criteria andJurisdictionOfFormationGreaterThanOrEqualTo(String value) {
+        public Criteria andJurisdictionOfFormationGreaterThanOrEqualTo(Byte value) {
             addCriterion("jurisdiction_of_formation >=", value, "jurisdictionOfFormation");
             return (Criteria) this;
         }
 
-        public Criteria andJurisdictionOfFormationLessThan(String value) {
+        public Criteria andJurisdictionOfFormationLessThan(Byte value) {
             addCriterion("jurisdiction_of_formation <", value, "jurisdictionOfFormation");
             return (Criteria) this;
         }
 
-        public Criteria andJurisdictionOfFormationLessThanOrEqualTo(String value) {
+        public Criteria andJurisdictionOfFormationLessThanOrEqualTo(Byte value) {
             addCriterion("jurisdiction_of_formation <=", value, "jurisdictionOfFormation");
             return (Criteria) this;
         }
 
-        public Criteria andJurisdictionOfFormationLike(String value) {
-            addCriterion("jurisdiction_of_formation like", value, "jurisdictionOfFormation");
-            return (Criteria) this;
-        }
-
-        public Criteria andJurisdictionOfFormationNotLike(String value) {
-            addCriterion("jurisdiction_of_formation not like", value, "jurisdictionOfFormation");
-            return (Criteria) this;
-        }
-
-        public Criteria andJurisdictionOfFormationIn(List<String> values) {
+        public Criteria andJurisdictionOfFormationIn(List<Byte> values) {
             addCriterion("jurisdiction_of_formation in", values, "jurisdictionOfFormation");
             return (Criteria) this;
         }
 
-        public Criteria andJurisdictionOfFormationNotIn(List<String> values) {
+        public Criteria andJurisdictionOfFormationNotIn(List<Byte> values) {
             addCriterion("jurisdiction_of_formation not in", values, "jurisdictionOfFormation");
             return (Criteria) this;
         }
 
-        public Criteria andJurisdictionOfFormationBetween(String value1, String value2) {
+        public Criteria andJurisdictionOfFormationBetween(Byte value1, Byte value2) {
             addCriterion("jurisdiction_of_formation between", value1, value2, "jurisdictionOfFormation");
             return (Criteria) this;
         }
 
-        public Criteria andJurisdictionOfFormationNotBetween(String value1, String value2) {
+        public Criteria andJurisdictionOfFormationNotBetween(Byte value1, Byte value2) {
             addCriterion("jurisdiction_of_formation not between", value1, value2, "jurisdictionOfFormation");
             return (Criteria) this;
         }
@@ -1575,62 +1545,52 @@ public class OrganizationHKExample {
             return (Criteria) this;
         }
 
-        public Criteria andOwnershipFormEqualTo(String value) {
+        public Criteria andOwnershipFormEqualTo(Byte value) {
             addCriterion("ownership_form =", value, "ownershipForm");
             return (Criteria) this;
         }
 
-        public Criteria andOwnershipFormNotEqualTo(String value) {
+        public Criteria andOwnershipFormNotEqualTo(Byte value) {
             addCriterion("ownership_form <>", value, "ownershipForm");
             return (Criteria) this;
         }
 
-        public Criteria andOwnershipFormGreaterThan(String value) {
+        public Criteria andOwnershipFormGreaterThan(Byte value) {
             addCriterion("ownership_form >", value, "ownershipForm");
             return (Criteria) this;
         }
 
-        public Criteria andOwnershipFormGreaterThanOrEqualTo(String value) {
+        public Criteria andOwnershipFormGreaterThanOrEqualTo(Byte value) {
             addCriterion("ownership_form >=", value, "ownershipForm");
             return (Criteria) this;
         }
 
-        public Criteria andOwnershipFormLessThan(String value) {
+        public Criteria andOwnershipFormLessThan(Byte value) {
             addCriterion("ownership_form <", value, "ownershipForm");
             return (Criteria) this;
         }
 
-        public Criteria andOwnershipFormLessThanOrEqualTo(String value) {
+        public Criteria andOwnershipFormLessThanOrEqualTo(Byte value) {
             addCriterion("ownership_form <=", value, "ownershipForm");
             return (Criteria) this;
         }
 
-        public Criteria andOwnershipFormLike(String value) {
-            addCriterion("ownership_form like", value, "ownershipForm");
-            return (Criteria) this;
-        }
-
-        public Criteria andOwnershipFormNotLike(String value) {
-            addCriterion("ownership_form not like", value, "ownershipForm");
-            return (Criteria) this;
-        }
-
-        public Criteria andOwnershipFormIn(List<String> values) {
+        public Criteria andOwnershipFormIn(List<Byte> values) {
             addCriterion("ownership_form in", values, "ownershipForm");
             return (Criteria) this;
         }
 
-        public Criteria andOwnershipFormNotIn(List<String> values) {
+        public Criteria andOwnershipFormNotIn(List<Byte> values) {
             addCriterion("ownership_form not in", values, "ownershipForm");
             return (Criteria) this;
         }
 
-        public Criteria andOwnershipFormBetween(String value1, String value2) {
+        public Criteria andOwnershipFormBetween(Byte value1, Byte value2) {
             addCriterion("ownership_form between", value1, value2, "ownershipForm");
             return (Criteria) this;
         }
 
-        public Criteria andOwnershipFormNotBetween(String value1, String value2) {
+        public Criteria andOwnershipFormNotBetween(Byte value1, Byte value2) {
             addCriterion("ownership_form not between", value1, value2, "ownershipForm");
             return (Criteria) this;
         }

atms-dao/src/main/java/pwc/taxtech/atms/organization/entity/OrganizationShareholder.java

@@ -47,7 +47,7 @@ public class OrganizationShareholder extends BaseEntity implements Serializable
      *
      * @mbg.generated
      */
-    private Integer ownershipForm;
+    private Byte ownershipForm;
 
     /**
      *
@@ -65,7 +65,7 @@ public class OrganizationShareholder extends BaseEntity implements Serializable
      *
      * @mbg.generated
      */
-    private String classOfShares;
+    private Byte classOfShares;
 
     /**
      *
@@ -195,7 +195,7 @@ public class OrganizationShareholder extends BaseEntity implements Serializable
      *
      * @mbg.generated
      */
-    public Integer getOwnershipForm() {
+    public Byte getOwnershipForm() {
         return ownershipForm;
     }
 
@@ -207,7 +207,7 @@ public class OrganizationShareholder extends BaseEntity implements Serializable
      *
      * @mbg.generated
      */
-    public void setOwnershipForm(Integer ownershipForm) {
+    public void setOwnershipForm(Byte ownershipForm) {
         this.ownershipForm = ownershipForm;
     }
 
@@ -243,7 +243,7 @@ public class OrganizationShareholder extends BaseEntity implements Serializable
      *
      * @mbg.generated
      */
-    public String getClassOfShares() {
+    public Byte getClassOfShares() {
         return classOfShares;
     }
 
@@ -255,8 +255,8 @@ public class OrganizationShareholder extends BaseEntity implements Serializable
      *
      * @mbg.generated
      */
-    public void setClassOfShares(String classOfShares) {
-        this.classOfShares = classOfShares == null ? null : classOfShares.trim();
+    public void setClassOfShares(Byte classOfShares) {
+        this.classOfShares = classOfShares;
     }
 
     /**

atms-dao/src/main/java/pwc/taxtech/atms/organization/entity/OrganizationShareholderExample.java

@@ -385,52 +385,52 @@ public class OrganizationShareholderExample {
             return (Criteria) this;
         }
 
-        public Criteria andOwnershipFormEqualTo(Integer value) {
+        public Criteria andOwnershipFormEqualTo(Byte value) {
             addCriterion("ownership_form =", value, "ownershipForm");
             return (Criteria) this;
         }
 
-        public Criteria andOwnershipFormNotEqualTo(Integer value) {
+        public Criteria andOwnershipFormNotEqualTo(Byte value) {
             addCriterion("ownership_form <>", value, "ownershipForm");
             return (Criteria) this;
         }
 
-        public Criteria andOwnershipFormGreaterThan(Integer value) {
+        public Criteria andOwnershipFormGreaterThan(Byte value) {
             addCriterion("ownership_form >", value, "ownershipForm");
             return (Criteria) this;
         }
 
-        public Criteria andOwnershipFormGreaterThanOrEqualTo(Integer value) {
+        public Criteria andOwnershipFormGreaterThanOrEqualTo(Byte value) {
             addCriterion("ownership_form >=", value, "ownershipForm");
             return (Criteria) this;
         }
 
-        public Criteria andOwnershipFormLessThan(Integer value) {
+        public Criteria andOwnershipFormLessThan(Byte value) {
             addCriterion("ownership_form <", value, "ownershipForm");
             return (Criteria) this;
         }
 
-        public Criteria andOwnershipFormLessThanOrEqualTo(Integer value) {
+        public Criteria andOwnershipFormLessThanOrEqualTo(Byte value) {
             addCriterion("ownership_form <=", value, "ownershipForm");
             return (Criteria) this;
         }
 
-        public Criteria andOwnershipFormIn(List<Integer> values) {
+        public Criteria andOwnershipFormIn(List<Byte> values) {
             addCriterion("ownership_form in", values, "ownershipForm");
             return (Criteria) this;
         }
 
-        public Criteria andOwnershipFormNotIn(List<Integer> values) {
+        public Criteria andOwnershipFormNotIn(List<Byte> values) {
             addCriterion("ownership_form not in", values, "ownershipForm");
             return (Criteria) this;
         }
 
-        public Criteria andOwnershipFormBetween(Integer value1, Integer value2) {
+        public Criteria andOwnershipFormBetween(Byte value1, Byte value2) {
             addCriterion("ownership_form between", value1, value2, "ownershipForm");
             return (Criteria) this;
         }
 
-        public Criteria andOwnershipFormNotBetween(Integer value1, Integer value2) {
+        public Criteria andOwnershipFormNotBetween(Byte value1, Byte value2) {
             addCriterion("ownership_form not between", value1, value2, "ownershipForm");
             return (Criteria) this;
         }
@@ -505,62 +505,52 @@ public class OrganizationShareholderExample {
             return (Criteria) this;
         }
 
-        public Criteria andClassOfSharesEqualTo(String value) {
+        public Criteria andClassOfSharesEqualTo(Byte value) {
             addCriterion("class_of_shares =", value, "classOfShares");
             return (Criteria) this;
         }
 
-        public Criteria andClassOfSharesNotEqualTo(String value) {
+        public Criteria andClassOfSharesNotEqualTo(Byte value) {
             addCriterion("class_of_shares <>", value, "classOfShares");
             return (Criteria) this;
         }
 
-        public Criteria andClassOfSharesGreaterThan(String value) {
+        public Criteria andClassOfSharesGreaterThan(Byte value) {
             addCriterion("class_of_shares >", value, "classOfShares");
             return (Criteria) this;
         }
 
-        public Criteria andClassOfSharesGreaterThanOrEqualTo(String value) {
+        public Criteria andClassOfSharesGreaterThanOrEqualTo(Byte value) {
             addCriterion("class_of_shares >=", value, "classOfShares");
             return (Criteria) this;
         }
 
-        public Criteria andClassOfSharesLessThan(String value) {
+        public Criteria andClassOfSharesLessThan(Byte value) {
             addCriterion("class_of_shares <", value, "classOfShares");
             return (Criteria) this;
         }
 
-        public Criteria andClassOfSharesLessThanOrEqualTo(String value) {
+        public Criteria andClassOfSharesLessThanOrEqualTo(Byte value) {
             addCriterion("class_of_shares <=", value, "classOfShares");
             return (Criteria) this;
         }
 
-        public Criteria andClassOfSharesLike(String value) {
-            addCriterion("class_of_shares like", value, "classOfShares");
-            return (Criteria) this;
-        }
-
-        public Criteria andClassOfSharesNotLike(String value) {
-            addCriterion("class_of_shares not like", value, "classOfShares");
-            return (Criteria) this;
-        }
-
-        public Criteria andClassOfSharesIn(List<String> values) {
+        public Criteria andClassOfSharesIn(List<Byte> values) {
             addCriterion("class_of_shares in", values, "classOfShares");
             return (Criteria) this;
         }
 
-        public Criteria andClassOfSharesNotIn(List<String> values) {
+        public Criteria andClassOfSharesNotIn(List<Byte> values) {
             addCriterion("class_of_shares not in", values, "classOfShares");
             return (Criteria) this;
         }
 
-        public Criteria andClassOfSharesBetween(String value1, String value2) {
+        public Criteria andClassOfSharesBetween(Byte value1, Byte value2) {
             addCriterion("class_of_shares between", value1, value2, "classOfShares");
             return (Criteria) this;
         }
 
-        public Criteria andClassOfSharesNotBetween(String value1, String value2) {
+        public Criteria andClassOfSharesNotBetween(Byte value1, Byte value2) {
             addCriterion("class_of_shares not between", value1, value2, "classOfShares");
             return (Criteria) this;
         }

atms-dao/src/main/resources/pwc/taxtech/atms/organization/dao/OrganizationDirectorMapper.xml

@@ -12,8 +12,8 @@
     <result column="residency" jdbcType="VARCHAR" property="residency" />
     <result column="date_of_appointment" jdbcType="TIMESTAMP" property="dateOfAppointment" />
     <result column="date_of_resignation" jdbcType="TIMESTAMP" property="dateOfResignation" />
-    <result column="is_executive" jdbcType="BIT" property="isExecutive" />
-    <result column="other_roles" jdbcType="VARCHAR" property="otherRoles" />
+    <result column="is_executive" jdbcType="TINYINT" property="isExecutive" />
+    <result column="other_roles" jdbcType="TINYINT" property="otherRoles" />
     <result column="is_delete" jdbcType="BIT" property="isDelete" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
@@ -149,7 +149,7 @@
       create_time, update_time)
     values (#{id,jdbcType=BIGINT}, #{entityId,jdbcType=BIGINT}, #{directorName,jdbcType=VARCHAR}, 
       #{residency,jdbcType=VARCHAR}, #{dateOfAppointment,jdbcType=TIMESTAMP}, #{dateOfResignation,jdbcType=TIMESTAMP}, 
-      #{isExecutive,jdbcType=BIT}, #{otherRoles,jdbcType=VARCHAR}, #{isDelete,jdbcType=BIT}, 
+      #{isExecutive,jdbcType=TINYINT}, #{otherRoles,jdbcType=TINYINT}, #{isDelete,jdbcType=BIT}, 
       #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="pwc.taxtech.atms.organization.entity.OrganizationDirector">
@@ -213,10 +213,10 @@
         #{dateOfResignation,jdbcType=TIMESTAMP},
       </if>
       <if test="isExecutive != null">
-        #{isExecutive,jdbcType=BIT},
+        #{isExecutive,jdbcType=TINYINT},
       </if>
       <if test="otherRoles != null">
-        #{otherRoles,jdbcType=VARCHAR},
+        #{otherRoles,jdbcType=TINYINT},
       </if>
       <if test="isDelete != null">
         #{isDelete,jdbcType=BIT},
@@ -265,10 +265,10 @@
         date_of_resignation = #{record.dateOfResignation,jdbcType=TIMESTAMP},
       </if>
       <if test="record.isExecutive != null">
-        is_executive = #{record.isExecutive,jdbcType=BIT},
+        is_executive = #{record.isExecutive,jdbcType=TINYINT},
       </if>
       <if test="record.otherRoles != null">
-        other_roles = #{record.otherRoles,jdbcType=VARCHAR},
+        other_roles = #{record.otherRoles,jdbcType=TINYINT},
       </if>
       <if test="record.isDelete != null">
         is_delete = #{record.isDelete,jdbcType=BIT},
@@ -296,8 +296,8 @@
       residency = #{record.residency,jdbcType=VARCHAR},
       date_of_appointment = #{record.dateOfAppointment,jdbcType=TIMESTAMP},
       date_of_resignation = #{record.dateOfResignation,jdbcType=TIMESTAMP},
-      is_executive = #{record.isExecutive,jdbcType=BIT},
-      other_roles = #{record.otherRoles,jdbcType=VARCHAR},
+      is_executive = #{record.isExecutive,jdbcType=TINYINT},
+      other_roles = #{record.otherRoles,jdbcType=TINYINT},
       is_delete = #{record.isDelete,jdbcType=BIT},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP}
@@ -328,10 +328,10 @@
         date_of_resignation = #{dateOfResignation,jdbcType=TIMESTAMP},
       </if>
       <if test="isExecutive != null">
-        is_executive = #{isExecutive,jdbcType=BIT},
+        is_executive = #{isExecutive,jdbcType=TINYINT},
       </if>
       <if test="otherRoles != null">
-        other_roles = #{otherRoles,jdbcType=VARCHAR},
+        other_roles = #{otherRoles,jdbcType=TINYINT},
       </if>
       <if test="isDelete != null">
         is_delete = #{isDelete,jdbcType=BIT},
@@ -356,8 +356,8 @@
       residency = #{residency,jdbcType=VARCHAR},
       date_of_appointment = #{dateOfAppointment,jdbcType=TIMESTAMP},
       date_of_resignation = #{dateOfResignation,jdbcType=TIMESTAMP},
-      is_executive = #{isExecutive,jdbcType=BIT},
-      other_roles = #{otherRoles,jdbcType=VARCHAR},
+      is_executive = #{isExecutive,jdbcType=TINYINT},
+      other_roles = #{otherRoles,jdbcType=TINYINT},
       is_delete = #{isDelete,jdbcType=BIT},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}

atms-dao/src/main/resources/pwc/taxtech/atms/organization/dao/OrganizationHKMapper.xml

@@ -11,7 +11,7 @@
     <result column="code" jdbcType="VARCHAR" property="code" />
     <result column="is_active" jdbcType="BIT" property="isActive" />
     <result column="parent_id" jdbcType="BIGINT" property="parentId" />
-    <result column="legal_form" jdbcType="VARCHAR" property="legalForm" />
+    <result column="legal_form" jdbcType="TINYINT" property="legalForm" />
     <result column="register_address" jdbcType="VARCHAR" property="registerAddress" />
     <result column="authorised_capital" jdbcType="REAL" property="authorisedCapital" />
     <result column="issued_capital" jdbcType="REAL" property="issuedCapital" />
@@ -21,13 +21,13 @@
     <result column="board_meeting_requirement" jdbcType="VARCHAR" property="boardMeetingRequirement" />
     <result column="business_license" jdbcType="VARCHAR" property="businessLicense" />
     <result column="renewal_of_business_license" jdbcType="TIMESTAMP" property="renewalOfBusinessLicense" />
-    <result column="entity_level" jdbcType="VARCHAR" property="entityLevel" />
+    <result column="entity_level" jdbcType="TINYINT" property="entityLevel" />
     <result column="date_of_incorporation" jdbcType="TIMESTAMP" property="dateOfIncorporation" />
-    <result column="jurisdiction_of_formation" jdbcType="VARCHAR" property="jurisdictionOfFormation" />
+    <result column="jurisdiction_of_formation" jdbcType="TINYINT" property="jurisdictionOfFormation" />
     <result column="financial_year_end" jdbcType="VARCHAR" property="financialYearEnd" />
     <result column="annual_audit_requirement" jdbcType="TIMESTAMP" property="annualAuditRequirement" />
     <result column="registered_agent" jdbcType="VARCHAR" property="registeredAgent" />
-    <result column="ownership_form" jdbcType="VARCHAR" property="ownershipForm" />
+    <result column="ownership_form" jdbcType="TINYINT" property="ownershipForm" />
     <result column="resident_secretary" jdbcType="VARCHAR" property="residentSecretary" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
@@ -179,14 +179,14 @@
       region_id, structure_id, industry_id, 
       business_unit_id)
     values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR}, 
-      #{isActive,jdbcType=BIT}, #{parentId,jdbcType=BIGINT}, #{legalForm,jdbcType=VARCHAR}, 
+      #{isActive,jdbcType=BIT}, #{parentId,jdbcType=BIGINT}, #{legalForm,jdbcType=TINYINT}, 
       #{registerAddress,jdbcType=VARCHAR}, #{authorisedCapital,jdbcType=REAL}, #{issuedCapital,jdbcType=REAL}, 
       #{industry,jdbcType=VARCHAR}, #{paymentOfAnnualGovernmentFee,jdbcType=TIMESTAMP}, 
       #{annualReturnFillings,jdbcType=TIMESTAMP}, #{boardMeetingRequirement,jdbcType=VARCHAR}, 
       #{businessLicense,jdbcType=VARCHAR}, #{renewalOfBusinessLicense,jdbcType=TIMESTAMP}, 
-      #{entityLevel,jdbcType=VARCHAR}, #{dateOfIncorporation,jdbcType=TIMESTAMP}, #{jurisdictionOfFormation,jdbcType=VARCHAR}, 
+      #{entityLevel,jdbcType=TINYINT}, #{dateOfIncorporation,jdbcType=TIMESTAMP}, #{jurisdictionOfFormation,jdbcType=TINYINT}, 
       #{financialYearEnd,jdbcType=VARCHAR}, #{annualAuditRequirement,jdbcType=TIMESTAMP}, 
-      #{registeredAgent,jdbcType=VARCHAR}, #{ownershipForm,jdbcType=VARCHAR}, #{residentSecretary,jdbcType=VARCHAR}, 
+      #{registeredAgent,jdbcType=VARCHAR}, #{ownershipForm,jdbcType=TINYINT}, #{residentSecretary,jdbcType=VARCHAR}, 
       #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{areaId,jdbcType=VARCHAR}, 
       #{regionId,jdbcType=VARCHAR}, #{structureId,jdbcType=VARCHAR}, #{industryId,jdbcType=VARCHAR}, 
       #{businessUnitId,jdbcType=VARCHAR})
@@ -306,7 +306,7 @@
         #{parentId,jdbcType=BIGINT},
       </if>
       <if test="legalForm != null">
-        #{legalForm,jdbcType=VARCHAR},
+        #{legalForm,jdbcType=TINYINT},
       </if>
       <if test="registerAddress != null">
         #{registerAddress,jdbcType=VARCHAR},
@@ -336,13 +336,13 @@
         #{renewalOfBusinessLicense,jdbcType=TIMESTAMP},
       </if>
       <if test="entityLevel != null">
-        #{entityLevel,jdbcType=VARCHAR},
+        #{entityLevel,jdbcType=TINYINT},
       </if>
       <if test="dateOfIncorporation != null">
         #{dateOfIncorporation,jdbcType=TIMESTAMP},
       </if>
       <if test="jurisdictionOfFormation != null">
-        #{jurisdictionOfFormation,jdbcType=VARCHAR},
+        #{jurisdictionOfFormation,jdbcType=TINYINT},
       </if>
       <if test="financialYearEnd != null">
         #{financialYearEnd,jdbcType=VARCHAR},
@@ -354,7 +354,7 @@
         #{registeredAgent,jdbcType=VARCHAR},
       </if>
       <if test="ownershipForm != null">
-        #{ownershipForm,jdbcType=VARCHAR},
+        #{ownershipForm,jdbcType=TINYINT},
       </if>
       <if test="residentSecretary != null">
         #{residentSecretary,jdbcType=VARCHAR},
@@ -415,7 +415,7 @@
         parent_id = #{record.parentId,jdbcType=BIGINT},
       </if>
       <if test="record.legalForm != null">
-        legal_form = #{record.legalForm,jdbcType=VARCHAR},
+        legal_form = #{record.legalForm,jdbcType=TINYINT},
       </if>
       <if test="record.registerAddress != null">
         register_address = #{record.registerAddress,jdbcType=VARCHAR},
@@ -445,13 +445,13 @@
         renewal_of_business_license = #{record.renewalOfBusinessLicense,jdbcType=TIMESTAMP},
       </if>
       <if test="record.entityLevel != null">
-        entity_level = #{record.entityLevel,jdbcType=VARCHAR},
+        entity_level = #{record.entityLevel,jdbcType=TINYINT},
       </if>
       <if test="record.dateOfIncorporation != null">
         date_of_incorporation = #{record.dateOfIncorporation,jdbcType=TIMESTAMP},
       </if>
       <if test="record.jurisdictionOfFormation != null">
-        jurisdiction_of_formation = #{record.jurisdictionOfFormation,jdbcType=VARCHAR},
+        jurisdiction_of_formation = #{record.jurisdictionOfFormation,jdbcType=TINYINT},
       </if>
       <if test="record.financialYearEnd != null">
         financial_year_end = #{record.financialYearEnd,jdbcType=VARCHAR},
@@ -463,7 +463,7 @@
         registered_agent = #{record.registeredAgent,jdbcType=VARCHAR},
       </if>
       <if test="record.ownershipForm != null">
-        ownership_form = #{record.ownershipForm,jdbcType=VARCHAR},
+        ownership_form = #{record.ownershipForm,jdbcType=TINYINT},
       </if>
       <if test="record.residentSecretary != null">
         resident_secretary = #{record.residentSecretary,jdbcType=VARCHAR},
@@ -505,7 +505,7 @@
       code = #{record.code,jdbcType=VARCHAR},
       is_active = #{record.isActive,jdbcType=BIT},
       parent_id = #{record.parentId,jdbcType=BIGINT},
-      legal_form = #{record.legalForm,jdbcType=VARCHAR},
+      legal_form = #{record.legalForm,jdbcType=TINYINT},
       register_address = #{record.registerAddress,jdbcType=VARCHAR},
       authorised_capital = #{record.authorisedCapital,jdbcType=REAL},
       issued_capital = #{record.issuedCapital,jdbcType=REAL},
@@ -515,13 +515,13 @@
       board_meeting_requirement = #{record.boardMeetingRequirement,jdbcType=VARCHAR},
       business_license = #{record.businessLicense,jdbcType=VARCHAR},
       renewal_of_business_license = #{record.renewalOfBusinessLicense,jdbcType=TIMESTAMP},
-      entity_level = #{record.entityLevel,jdbcType=VARCHAR},
+      entity_level = #{record.entityLevel,jdbcType=TINYINT},
       date_of_incorporation = #{record.dateOfIncorporation,jdbcType=TIMESTAMP},
-      jurisdiction_of_formation = #{record.jurisdictionOfFormation,jdbcType=VARCHAR},
+      jurisdiction_of_formation = #{record.jurisdictionOfFormation,jdbcType=TINYINT},
       financial_year_end = #{record.financialYearEnd,jdbcType=VARCHAR},
       annual_audit_requirement = #{record.annualAuditRequirement,jdbcType=TIMESTAMP},
       registered_agent = #{record.registeredAgent,jdbcType=VARCHAR},
-      ownership_form = #{record.ownershipForm,jdbcType=VARCHAR},
+      ownership_form = #{record.ownershipForm,jdbcType=TINYINT},
       resident_secretary = #{record.residentSecretary,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
@@ -554,7 +554,7 @@
         parent_id = #{parentId,jdbcType=BIGINT},
       </if>
       <if test="legalForm != null">
-        legal_form = #{legalForm,jdbcType=VARCHAR},
+        legal_form = #{legalForm,jdbcType=TINYINT},
       </if>
       <if test="registerAddress != null">
         register_address = #{registerAddress,jdbcType=VARCHAR},
@@ -584,13 +584,13 @@
         renewal_of_business_license = #{renewalOfBusinessLicense,jdbcType=TIMESTAMP},
       </if>
       <if test="entityLevel != null">
-        entity_level = #{entityLevel,jdbcType=VARCHAR},
+        entity_level = #{entityLevel,jdbcType=TINYINT},
       </if>
       <if test="dateOfIncorporation != null">
         date_of_incorporation = #{dateOfIncorporation,jdbcType=TIMESTAMP},
       </if>
       <if test="jurisdictionOfFormation != null">
-        jurisdiction_of_formation = #{jurisdictionOfFormation,jdbcType=VARCHAR},
+        jurisdiction_of_formation = #{jurisdictionOfFormation,jdbcType=TINYINT},
       </if>
       <if test="financialYearEnd != null">
         financial_year_end = #{financialYearEnd,jdbcType=VARCHAR},
@@ -602,7 +602,7 @@
         registered_agent = #{registeredAgent,jdbcType=VARCHAR},
       </if>
       <if test="ownershipForm != null">
-        ownership_form = #{ownershipForm,jdbcType=VARCHAR},
+        ownership_form = #{ownershipForm,jdbcType=TINYINT},
       </if>
       <if test="residentSecretary != null">
         resident_secretary = #{residentSecretary,jdbcType=VARCHAR},
@@ -641,7 +641,7 @@
       code = #{code,jdbcType=VARCHAR},
       is_active = #{isActive,jdbcType=BIT},
       parent_id = #{parentId,jdbcType=BIGINT},
-      legal_form = #{legalForm,jdbcType=VARCHAR},
+      legal_form = #{legalForm,jdbcType=TINYINT},
       register_address = #{registerAddress,jdbcType=VARCHAR},
       authorised_capital = #{authorisedCapital,jdbcType=REAL},
       issued_capital = #{issuedCapital,jdbcType=REAL},
@@ -651,13 +651,13 @@
       board_meeting_requirement = #{boardMeetingRequirement,jdbcType=VARCHAR},
       business_license = #{businessLicense,jdbcType=VARCHAR},
       renewal_of_business_license = #{renewalOfBusinessLicense,jdbcType=TIMESTAMP},
-      entity_level = #{entityLevel,jdbcType=VARCHAR},
+      entity_level = #{entityLevel,jdbcType=TINYINT},
       date_of_incorporation = #{dateOfIncorporation,jdbcType=TIMESTAMP},
-      jurisdiction_of_formation = #{jurisdictionOfFormation,jdbcType=VARCHAR},
+      jurisdiction_of_formation = #{jurisdictionOfFormation,jdbcType=TINYINT},
       financial_year_end = #{financialYearEnd,jdbcType=VARCHAR},
       annual_audit_requirement = #{annualAuditRequirement,jdbcType=TIMESTAMP},
       registered_agent = #{registeredAgent,jdbcType=VARCHAR},
-      ownership_form = #{ownershipForm,jdbcType=VARCHAR},
+      ownership_form = #{ownershipForm,jdbcType=TINYINT},
       resident_secretary = #{residentSecretary,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},

atms-dao/src/main/resources/pwc/taxtech/atms/organization/dao/OrganizationShareholderMapper.xml

@@ -9,9 +9,9 @@
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="entity_id" jdbcType="BIGINT" property="entityId" />
     <result column="investment_entity_id" jdbcType="BIGINT" property="investmentEntityId" />
-    <result column="ownership_form" jdbcType="INTEGER" property="ownershipForm" />
+    <result column="ownership_form" jdbcType="TINYINT" property="ownershipForm" />
     <result column="common_preferred" jdbcType="BIT" property="commonPreferred" />
-    <result column="class_of_shares" jdbcType="VARCHAR" property="classOfShares" />
+    <result column="class_of_shares" jdbcType="TINYINT" property="classOfShares" />
     <result column="voting_percentage" jdbcType="VARCHAR" property="votingPercentage" />
     <result column="is_delete" jdbcType="BIT" property="isDelete" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
@@ -147,7 +147,7 @@
       voting_percentage, is_delete, create_time, 
       update_time)
     values (#{id,jdbcType=BIGINT}, #{entityId,jdbcType=BIGINT}, #{investmentEntityId,jdbcType=BIGINT}, 
-      #{ownershipForm,jdbcType=INTEGER}, #{commonPreferred,jdbcType=BIT}, #{classOfShares,jdbcType=VARCHAR}, 
+      #{ownershipForm,jdbcType=TINYINT}, #{commonPreferred,jdbcType=BIT}, #{classOfShares,jdbcType=TINYINT}, 
       #{votingPercentage,jdbcType=VARCHAR}, #{isDelete,jdbcType=BIT}, #{createTime,jdbcType=TIMESTAMP}, 
       #{updateTime,jdbcType=TIMESTAMP})
   </insert>
@@ -200,13 +200,13 @@
         #{investmentEntityId,jdbcType=BIGINT},
       </if>
       <if test="ownershipForm != null">
-        #{ownershipForm,jdbcType=INTEGER},
+        #{ownershipForm,jdbcType=TINYINT},
       </if>
       <if test="commonPreferred != null">
         #{commonPreferred,jdbcType=BIT},
       </if>
       <if test="classOfShares != null">
-        #{classOfShares,jdbcType=VARCHAR},
+        #{classOfShares,jdbcType=TINYINT},
       </if>
       <if test="votingPercentage != null">
         #{votingPercentage,jdbcType=VARCHAR},
@@ -249,13 +249,13 @@
         investment_entity_id = #{record.investmentEntityId,jdbcType=BIGINT},
       </if>
       <if test="record.ownershipForm != null">
-        ownership_form = #{record.ownershipForm,jdbcType=INTEGER},
+        ownership_form = #{record.ownershipForm,jdbcType=TINYINT},
       </if>
       <if test="record.commonPreferred != null">
         common_preferred = #{record.commonPreferred,jdbcType=BIT},
       </if>
       <if test="record.classOfShares != null">
-        class_of_shares = #{record.classOfShares,jdbcType=VARCHAR},
+        class_of_shares = #{record.classOfShares,jdbcType=TINYINT},
       </if>
       <if test="record.votingPercentage != null">
         voting_percentage = #{record.votingPercentage,jdbcType=VARCHAR},
@@ -283,9 +283,9 @@
     set id = #{record.id,jdbcType=BIGINT},
       entity_id = #{record.entityId,jdbcType=BIGINT},
       investment_entity_id = #{record.investmentEntityId,jdbcType=BIGINT},
-      ownership_form = #{record.ownershipForm,jdbcType=INTEGER},
+      ownership_form = #{record.ownershipForm,jdbcType=TINYINT},
       common_preferred = #{record.commonPreferred,jdbcType=BIT},
-      class_of_shares = #{record.classOfShares,jdbcType=VARCHAR},
+      class_of_shares = #{record.classOfShares,jdbcType=TINYINT},
       voting_percentage = #{record.votingPercentage,jdbcType=VARCHAR},
       is_delete = #{record.isDelete,jdbcType=BIT},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
@@ -308,13 +308,13 @@
         investment_entity_id = #{investmentEntityId,jdbcType=BIGINT},
       </if>
       <if test="ownershipForm != null">
-        ownership_form = #{ownershipForm,jdbcType=INTEGER},
+        ownership_form = #{ownershipForm,jdbcType=TINYINT},
       </if>
       <if test="commonPreferred != null">
         common_preferred = #{commonPreferred,jdbcType=BIT},
       </if>
       <if test="classOfShares != null">
-        class_of_shares = #{classOfShares,jdbcType=VARCHAR},
+        class_of_shares = #{classOfShares,jdbcType=TINYINT},
       </if>
       <if test="votingPercentage != null">
         voting_percentage = #{votingPercentage,jdbcType=VARCHAR},
@@ -339,9 +339,9 @@
     update organization_shareholder
     set entity_id = #{entityId,jdbcType=BIGINT},
       investment_entity_id = #{investmentEntityId,jdbcType=BIGINT},
-      ownership_form = #{ownershipForm,jdbcType=INTEGER},
+      ownership_form = #{ownershipForm,jdbcType=TINYINT},
       common_preferred = #{commonPreferred,jdbcType=BIT},
-      class_of_shares = #{classOfShares,jdbcType=VARCHAR},
+      class_of_shares = #{classOfShares,jdbcType=TINYINT},
       voting_percentage = #{votingPercentage,jdbcType=VARCHAR},
       is_delete = #{isDelete,jdbcType=BIT},
       create_time = #{createTime,jdbcType=TIMESTAMP},