[dev] re regernate mapper xml java use oracle table

atms-dao/src/main/java/pwc/taxtech/atms/entity/AreaRegion.java

@@ -4,35 +4,14 @@ import java.io.Serializable;
 
 /**
  * This class was generated by MyBatis Generator.
- * This class corresponds to the database table AREA_REGION
+ * This class corresponds to the database table TAX_ADMIN.AREA_REGION
  *
  * @mbg.generated do_not_delete_during_merge
  */
 public class AreaRegion extends BaseEntity implements Serializable {
-    private Area area;
-
-    private Region region;
-
-    public Area getArea() {
-        return area;
-    }
-
-    public void setArea(Area area) {
-        this.area = area;
-    }
-
-    public Region getRegion() {
-        return region;
-    }
-
-    public void setRegion(Region region) {
-        this.region = region;
-    }
-
     /**
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column AREA_REGION.id
-
+     * This field corresponds to the database column TAX_ADMIN.AREA_REGION.ID
      *
      * @mbg.generated
      */
@@ -40,7 +19,7 @@ public class AreaRegion extends BaseEntity implements Serializable {
 
     /**
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column AREA_REGION.AREA_ID
+     * This field corresponds to the database column TAX_ADMIN.AREA_REGION.AREA_ID
      *
      * @mbg.generated
      */
@@ -48,7 +27,7 @@ public class AreaRegion extends BaseEntity implements Serializable {
 
     /**
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column AREA_REGION.REGION_ID
+     * This field corresponds to the database column TAX_ADMIN.AREA_REGION.REGION_ID
      *
      * @mbg.generated
      */
@@ -56,17 +35,22 @@ public class AreaRegion extends BaseEntity implements Serializable {
 
     /**
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table AREA_REGION
+     * This field corresponds to the database table TAX_ADMIN.AREA_REGION
      *
      * @mbg.generated
      */
     private static final long serialVersionUID = 1L;
 
+    private Area area;
+
+
+    private Region region;
+
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column AREA_REGION.id
+     * This method returns the value of the database column TAX_ADMIN.AREA_REGION.ID
      *
-     * @return the value of AREA_REGION.id
+     * @return the value of TAX_ADMIN.AREA_REGION.ID
      * @mbg.generated
      */
     public String getId() {
@@ -75,9 +59,9 @@ public class AreaRegion extends BaseEntity implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column AREA_REGION.id
+     * This method sets the value of the database column TAX_ADMIN.AREA_REGION.ID
      *
-     * @param id the value for AREA_REGION.id
+     * @param id the value for TAX_ADMIN.AREA_REGION.ID
      * @mbg.generated
      */
     public void setId(String id) {
@@ -86,9 +70,9 @@ public class AreaRegion extends BaseEntity implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column AREA_REGION.AREA_ID
+     * This method returns the value of the database column TAX_ADMIN.AREA_REGION.AREA_ID
      *
-     * @return the value of AREA_REGION.AREA_ID
+     * @return the value of TAX_ADMIN.AREA_REGION.AREA_ID
      * @mbg.generated
      */
     public String getAreaId() {
@@ -97,9 +81,9 @@ public class AreaRegion extends BaseEntity implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column AREA_REGION.AREA_ID
+     * This method sets the value of the database column TAX_ADMIN.AREA_REGION.AREA_ID
      *
-     * @param areaId the value for AREA_REGION.AREA_ID
+     * @param areaId the value for TAX_ADMIN.AREA_REGION.AREA_ID
      * @mbg.generated
      */
     public void setAreaId(String areaId) {
@@ -108,9 +92,9 @@ public class AreaRegion extends BaseEntity implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column AREA_REGION.REGION_ID
+     * This method returns the value of the database column TAX_ADMIN.AREA_REGION.REGION_ID
      *
-     * @return the value of AREA_REGION.REGION_ID
+     * @return the value of TAX_ADMIN.AREA_REGION.REGION_ID
      * @mbg.generated
      */
     public String getRegionId() {
@@ -119,9 +103,9 @@ public class AreaRegion extends BaseEntity implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column AREA_REGION.REGION_ID
+     * This method sets the value of the database column TAX_ADMIN.AREA_REGION.REGION_ID
      *
-     * @param regionId the value for AREA_REGION.REGION_ID
+     * @param regionId the value for TAX_ADMIN.AREA_REGION.REGION_ID
      * @mbg.generated
      */
     public void setRegionId(String regionId) {
@@ -130,7 +114,7 @@ public class AreaRegion extends BaseEntity implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table AREA_REGION
+     * This method corresponds to the database table TAX_ADMIN.AREA_REGION
      *
      * @mbg.generated
      */
@@ -146,4 +130,20 @@ public class AreaRegion extends BaseEntity implements Serializable {
         sb.append("]");
         return sb.toString();
     }
+
+    public Area getArea() {
+        return area;
+    }
+
+    public void setArea(Area area) {
+        this.area = area;
+    }
+
+    public Region getRegion() {
+        return region;
+    }
+
+    public void setRegion(Region region) {
+        this.region = region;
+    }
 }
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/entity/DimensionExample.java

@@ -415,52 +415,52 @@ public class DimensionExample {
             return (Criteria) this;
         }
 
-        public Criteria andOrderIndexEqualTo(Boolean value) {
+        public Criteria andOrderIndexEqualTo(Short value) {
             addCriterion("ORDER_INDEX =", value, "orderIndex");
             return (Criteria) this;
         }
 
-        public Criteria andOrderIndexNotEqualTo(Boolean value) {
+        public Criteria andOrderIndexNotEqualTo(Short value) {
             addCriterion("ORDER_INDEX <>", value, "orderIndex");
             return (Criteria) this;
         }
 
-        public Criteria andOrderIndexGreaterThan(Boolean value) {
+        public Criteria andOrderIndexGreaterThan(Short value) {
             addCriterion("ORDER_INDEX >", value, "orderIndex");
             return (Criteria) this;
         }
 
-        public Criteria andOrderIndexGreaterThanOrEqualTo(Boolean value) {
+        public Criteria andOrderIndexGreaterThanOrEqualTo(Short value) {
             addCriterion("ORDER_INDEX >=", value, "orderIndex");
             return (Criteria) this;
         }
 
-        public Criteria andOrderIndexLessThan(Boolean value) {
+        public Criteria andOrderIndexLessThan(Short value) {
             addCriterion("ORDER_INDEX <", value, "orderIndex");
             return (Criteria) this;
         }
 
-        public Criteria andOrderIndexLessThanOrEqualTo(Boolean value) {
+        public Criteria andOrderIndexLessThanOrEqualTo(Short value) {
             addCriterion("ORDER_INDEX <=", value, "orderIndex");
             return (Criteria) this;
         }
 
-        public Criteria andOrderIndexIn(List<Boolean> values) {
+        public Criteria andOrderIndexIn(List<Short> values) {
             addCriterion("ORDER_INDEX in", values, "orderIndex");
             return (Criteria) this;
         }
 
-        public Criteria andOrderIndexNotIn(List<Boolean> values) {
+        public Criteria andOrderIndexNotIn(List<Short> values) {
             addCriterion("ORDER_INDEX not in", values, "orderIndex");
             return (Criteria) this;
         }
 
-        public Criteria andOrderIndexBetween(Boolean value1, Boolean value2) {
+        public Criteria andOrderIndexBetween(Short value1, Short value2) {
             addCriterion("ORDER_INDEX between", value1, value2, "orderIndex");
             return (Criteria) this;
         }
 
-        public Criteria andOrderIndexNotBetween(Boolean value1, Boolean value2) {
+        public Criteria andOrderIndexNotBetween(Short value1, Short value2) {
             addCriterion("ORDER_INDEX not between", value1, value2, "orderIndex");
             return (Criteria) this;
         }

atms-dao/src/main/java/pwc/taxtech/atms/entity/EnterpriseAccountSetOrg.java

@@ -6,7 +6,7 @@ import java.util.Date;
 /**
  *
  * This class was generated by MyBatis Generator.
- * This class corresponds to the database table ENTERPRISE_ACCOUNT_SET_ORG
+ * This class corresponds to the database table TAX_ADMIN.ENTERPRISE_ACCOUNT_SET_ORG
  *
  * @mbg.generated do_not_delete_during_merge
  */
@@ -14,7 +14,7 @@ public class EnterpriseAccountSetOrg extends BaseEntity implements Serializable
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column ENTERPRISE_ACCOUNT_SET_ORG.ID
+     * This field corresponds to the database column TAX_ADMIN.ENTERPRISE_ACCOUNT_SET_ORG.ID
      *
      * @mbg.generated
      */
@@ -23,7 +23,7 @@ public class EnterpriseAccountSetOrg extends BaseEntity implements Serializable
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column ENTERPRISE_ACCOUNT_SET_ORG.ENTERPRISE_ACCOUNT_SET_ID
+     * This field corresponds to the database column TAX_ADMIN.ENTERPRISE_ACCOUNT_SET_ORG.ENTERPRISE_ACCOUNT_SET_ID
      *
      * @mbg.generated
      */
@@ -32,7 +32,7 @@ public class EnterpriseAccountSetOrg extends BaseEntity implements Serializable
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column ENTERPRISE_ACCOUNT_SET_ORG.ORGANIZATION_ID
+     * This field corresponds to the database column TAX_ADMIN.ENTERPRISE_ACCOUNT_SET_ORG.ORGANIZATION_ID
      *
      * @mbg.generated
      */
@@ -41,7 +41,7 @@ public class EnterpriseAccountSetOrg extends BaseEntity implements Serializable
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column ENTERPRISE_ACCOUNT_SET_ORG.EFFECTIVE_DATE
+     * This field corresponds to the database column TAX_ADMIN.ENTERPRISE_ACCOUNT_SET_ORG.EFFECTIVE_DATE
      *
      * @mbg.generated
      */
@@ -50,27 +50,27 @@ public class EnterpriseAccountSetOrg extends BaseEntity implements Serializable
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column ENTERPRISE_ACCOUNT_SET_ORG.EXPIRED_DATE
+     * This field corresponds to the database column TAX_ADMIN.ENTERPRISE_ACCOUNT_SET_ORG.EXPIRED_DATE
      *
      * @mbg.generated
      */
     private Date expiredDate;
 
-    private Organization organization;
-
     /**
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table ENTERPRISE_ACCOUNT_SET_ORG
+     * This field corresponds to the database table TAX_ADMIN.ENTERPRISE_ACCOUNT_SET_ORG
      *
      * @mbg.generated
      */
     private static final long serialVersionUID = 1L;
 
+    private Organization organization;
+
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column ENTERPRISE_ACCOUNT_SET_ORG.ID
+     * This method returns the value of the database column TAX_ADMIN.ENTERPRISE_ACCOUNT_SET_ORG.ID
      *
-     * @return the value of ENTERPRISE_ACCOUNT_SET_ORG.ID
+     * @return the value of TAX_ADMIN.ENTERPRISE_ACCOUNT_SET_ORG.ID
      *
      * @mbg.generated
      */
@@ -80,9 +80,9 @@ public class EnterpriseAccountSetOrg extends BaseEntity implements Serializable
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column ENTERPRISE_ACCOUNT_SET_ORG.ID
+     * This method sets the value of the database column TAX_ADMIN.ENTERPRISE_ACCOUNT_SET_ORG.ID
      *
-     * @param id the value for ENTERPRISE_ACCOUNT_SET_ORG.ID
+     * @param id the value for TAX_ADMIN.ENTERPRISE_ACCOUNT_SET_ORG.ID
      *
      * @mbg.generated
      */
@@ -92,9 +92,9 @@ public class EnterpriseAccountSetOrg extends BaseEntity implements Serializable
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column ENTERPRISE_ACCOUNT_SET_ORG.ENTERPRISE_ACCOUNT_SET_ID
+     * This method returns the value of the database column TAX_ADMIN.ENTERPRISE_ACCOUNT_SET_ORG.ENTERPRISE_ACCOUNT_SET_ID
      *
-     * @return the value of ENTERPRISE_ACCOUNT_SET_ORG.ENTERPRISE_ACCOUNT_SET_ID
+     * @return the value of TAX_ADMIN.ENTERPRISE_ACCOUNT_SET_ORG.ENTERPRISE_ACCOUNT_SET_ID
      *
      * @mbg.generated
      */
@@ -104,9 +104,9 @@ public class EnterpriseAccountSetOrg extends BaseEntity implements Serializable
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column ENTERPRISE_ACCOUNT_SET_ORG.ENTERPRISE_ACCOUNT_SET_ID
+     * This method sets the value of the database column TAX_ADMIN.ENTERPRISE_ACCOUNT_SET_ORG.ENTERPRISE_ACCOUNT_SET_ID
      *
-     * @param enterpriseAccountSetId the value for ENTERPRISE_ACCOUNT_SET_ORG.ENTERPRISE_ACCOUNT_SET_ID
+     * @param enterpriseAccountSetId the value for TAX_ADMIN.ENTERPRISE_ACCOUNT_SET_ORG.ENTERPRISE_ACCOUNT_SET_ID
      *
      * @mbg.generated
      */
@@ -116,9 +116,9 @@ public class EnterpriseAccountSetOrg extends BaseEntity implements Serializable
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column ENTERPRISE_ACCOUNT_SET_ORG.ORGANIZATION_ID
+     * This method returns the value of the database column TAX_ADMIN.ENTERPRISE_ACCOUNT_SET_ORG.ORGANIZATION_ID
      *
-     * @return the value of ENTERPRISE_ACCOUNT_SET_ORG.ORGANIZATION_ID
+     * @return the value of TAX_ADMIN.ENTERPRISE_ACCOUNT_SET_ORG.ORGANIZATION_ID
      *
      * @mbg.generated
      */
@@ -128,9 +128,9 @@ public class EnterpriseAccountSetOrg extends BaseEntity implements Serializable
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column ENTERPRISE_ACCOUNT_SET_ORG.ORGANIZATION_ID
+     * This method sets the value of the database column TAX_ADMIN.ENTERPRISE_ACCOUNT_SET_ORG.ORGANIZATION_ID
      *
-     * @param organizationId the value for ENTERPRISE_ACCOUNT_SET_ORG.ORGANIZATION_ID
+     * @param organizationId the value for TAX_ADMIN.ENTERPRISE_ACCOUNT_SET_ORG.ORGANIZATION_ID
      *
      * @mbg.generated
      */
@@ -140,9 +140,9 @@ public class EnterpriseAccountSetOrg extends BaseEntity implements Serializable
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column ENTERPRISE_ACCOUNT_SET_ORG.EFFECTIVE_DATE
+     * This method returns the value of the database column TAX_ADMIN.ENTERPRISE_ACCOUNT_SET_ORG.EFFECTIVE_DATE
      *
-     * @return the value of ENTERPRISE_ACCOUNT_SET_ORG.EFFECTIVE_DATE
+     * @return the value of TAX_ADMIN.ENTERPRISE_ACCOUNT_SET_ORG.EFFECTIVE_DATE
      *
      * @mbg.generated
      */
@@ -152,9 +152,9 @@ public class EnterpriseAccountSetOrg extends BaseEntity implements Serializable
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column ENTERPRISE_ACCOUNT_SET_ORG.EFFECTIVE_DATE
+     * This method sets the value of the database column TAX_ADMIN.ENTERPRISE_ACCOUNT_SET_ORG.EFFECTIVE_DATE
      *
-     * @param effectiveDate the value for ENTERPRISE_ACCOUNT_SET_ORG.EFFECTIVE_DATE
+     * @param effectiveDate the value for TAX_ADMIN.ENTERPRISE_ACCOUNT_SET_ORG.EFFECTIVE_DATE
      *
      * @mbg.generated
      */
@@ -164,9 +164,9 @@ public class EnterpriseAccountSetOrg extends BaseEntity implements Serializable
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column ENTERPRISE_ACCOUNT_SET_ORG.EXPIRED_DATE
+     * This method returns the value of the database column TAX_ADMIN.ENTERPRISE_ACCOUNT_SET_ORG.EXPIRED_DATE
      *
-     * @return the value of ENTERPRISE_ACCOUNT_SET_ORG.EXPIRED_DATE
+     * @return the value of TAX_ADMIN.ENTERPRISE_ACCOUNT_SET_ORG.EXPIRED_DATE
      *
      * @mbg.generated
      */
@@ -176,9 +176,9 @@ public class EnterpriseAccountSetOrg extends BaseEntity implements Serializable
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column ENTERPRISE_ACCOUNT_SET_ORG.EXPIRED_DATE
+     * This method sets the value of the database column TAX_ADMIN.ENTERPRISE_ACCOUNT_SET_ORG.EXPIRED_DATE
      *
-     * @param expiredDate the value for ENTERPRISE_ACCOUNT_SET_ORG.EXPIRED_DATE
+     * @param expiredDate the value for TAX_ADMIN.ENTERPRISE_ACCOUNT_SET_ORG.EXPIRED_DATE
      *
      * @mbg.generated
      */
@@ -188,7 +188,7 @@ public class EnterpriseAccountSetOrg extends BaseEntity implements Serializable
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table ENTERPRISE_ACCOUNT_SET_ORG
+     * This method corresponds to the database table TAX_ADMIN.ENTERPRISE_ACCOUNT_SET_ORG
      *
      * @mbg.generated
      */

atms-dao/src/main/java/pwc/taxtech/atms/entity/OrganizationExample.java

@@ -1975,73 +1975,73 @@ public class OrganizationExample {
             return (Criteria) this;
         }
 
-        public Criteria andVehicleroutinglocationIsNull() {
-            addCriterion("VEHICLEROUTINGLOCATION is null");
+        public Criteria andVehicleRoutingLocationIsNull() {
+            addCriterion("VEHICLE_ROUTING_LOCATION is null");
             return (Criteria) this;
         }
 
-        public Criteria andVehicleroutinglocationIsNotNull() {
-            addCriterion("VEHICLEROUTINGLOCATION is not null");
+        public Criteria andVehicleRoutingLocationIsNotNull() {
+            addCriterion("VEHICLE_ROUTING_LOCATION is not null");
             return (Criteria) this;
         }
 
-        public Criteria andVehicleroutinglocationEqualTo(String value) {
-            addCriterion("VEHICLEROUTINGLOCATION =", value, "vehicleroutinglocation");
+        public Criteria andVehicleRoutingLocationEqualTo(String value) {
+            addCriterion("VEHICLE_ROUTING_LOCATION =", value, "vehicleRoutingLocation");
             return (Criteria) this;
         }
 
-        public Criteria andVehicleroutinglocationNotEqualTo(String value) {
-            addCriterion("VEHICLEROUTINGLOCATION <>", value, "vehicleroutinglocation");
+        public Criteria andVehicleRoutingLocationNotEqualTo(String value) {
+            addCriterion("VEHICLE_ROUTING_LOCATION <>", value, "vehicleRoutingLocation");
             return (Criteria) this;
         }
 
-        public Criteria andVehicleroutinglocationGreaterThan(String value) {
-            addCriterion("VEHICLEROUTINGLOCATION >", value, "vehicleroutinglocation");
+        public Criteria andVehicleRoutingLocationGreaterThan(String value) {
+            addCriterion("VEHICLE_ROUTING_LOCATION >", value, "vehicleRoutingLocation");
             return (Criteria) this;
         }
 
-        public Criteria andVehicleroutinglocationGreaterThanOrEqualTo(String value) {
-            addCriterion("VEHICLEROUTINGLOCATION >=", value, "vehicleroutinglocation");
+        public Criteria andVehicleRoutingLocationGreaterThanOrEqualTo(String value) {
+            addCriterion("VEHICLE_ROUTING_LOCATION >=", value, "vehicleRoutingLocation");
             return (Criteria) this;
         }
 
-        public Criteria andVehicleroutinglocationLessThan(String value) {
-            addCriterion("VEHICLEROUTINGLOCATION <", value, "vehicleroutinglocation");
+        public Criteria andVehicleRoutingLocationLessThan(String value) {
+            addCriterion("VEHICLE_ROUTING_LOCATION <", value, "vehicleRoutingLocation");
             return (Criteria) this;
         }
 
-        public Criteria andVehicleroutinglocationLessThanOrEqualTo(String value) {
-            addCriterion("VEHICLEROUTINGLOCATION <=", value, "vehicleroutinglocation");
+        public Criteria andVehicleRoutingLocationLessThanOrEqualTo(String value) {
+            addCriterion("VEHICLE_ROUTING_LOCATION <=", value, "vehicleRoutingLocation");
             return (Criteria) this;
         }
 
-        public Criteria andVehicleroutinglocationLike(String value) {
-            addCriterion("VEHICLEROUTINGLOCATION like", value, "vehicleroutinglocation");
+        public Criteria andVehicleRoutingLocationLike(String value) {
+            addCriterion("VEHICLE_ROUTING_LOCATION like", value, "vehicleRoutingLocation");
             return (Criteria) this;
         }
 
-        public Criteria andVehicleroutinglocationNotLike(String value) {
-            addCriterion("VEHICLEROUTINGLOCATION not like", value, "vehicleroutinglocation");
+        public Criteria andVehicleRoutingLocationNotLike(String value) {
+            addCriterion("VEHICLE_ROUTING_LOCATION not like", value, "vehicleRoutingLocation");
             return (Criteria) this;
         }
 
-        public Criteria andVehicleroutinglocationIn(List<String> values) {
-            addCriterion("VEHICLEROUTINGLOCATION in", values, "vehicleroutinglocation");
+        public Criteria andVehicleRoutingLocationIn(List<String> values) {
+            addCriterion("VEHICLE_ROUTING_LOCATION in", values, "vehicleRoutingLocation");
             return (Criteria) this;
         }
 
-        public Criteria andVehicleroutinglocationNotIn(List<String> values) {
-            addCriterion("VEHICLEROUTINGLOCATION not in", values, "vehicleroutinglocation");
+        public Criteria andVehicleRoutingLocationNotIn(List<String> values) {
+            addCriterion("VEHICLE_ROUTING_LOCATION not in", values, "vehicleRoutingLocation");
             return (Criteria) this;
         }
 
-        public Criteria andVehicleroutinglocationBetween(String value1, String value2) {
-            addCriterion("VEHICLEROUTINGLOCATION between", value1, value2, "vehicleroutinglocation");
+        public Criteria andVehicleRoutingLocationBetween(String value1, String value2) {
+            addCriterion("VEHICLE_ROUTING_LOCATION between", value1, value2, "vehicleRoutingLocation");
             return (Criteria) this;
         }
 
-        public Criteria andVehicleroutinglocationNotBetween(String value1, String value2) {
-            addCriterion("VEHICLEROUTINGLOCATION not between", value1, value2, "vehicleroutinglocation");
+        public Criteria andVehicleRoutingLocationNotBetween(String value1, String value2) {
+            addCriterion("VEHICLE_ROUTING_LOCATION not between", value1, value2, "vehicleRoutingLocation");
             return (Criteria) this;
         }
 

atms-dao/src/main/java/pwc/taxtech/atms/entity/ProjectStatusManage.java

@@ -23,11 +23,11 @@ public class ProjectStatusManage extends BaseEntity implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column TAX_ADMIN.PROJECT_STATUS_MANAGE.DB_NAME
+     * This field corresponds to the database column TAX_ADMIN.PROJECT_STATUS_MANAGE.PROJECT_ID
      *
      * @mbg.generated
      */
-    private String dbName;
+    private String projectId;
 
     /**
      *
@@ -108,26 +108,26 @@ public class ProjectStatusManage extends BaseEntity implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column TAX_ADMIN.PROJECT_STATUS_MANAGE.DB_NAME
+     * This method returns the value of the database column TAX_ADMIN.PROJECT_STATUS_MANAGE.PROJECT_ID
      *
-     * @return the value of TAX_ADMIN.PROJECT_STATUS_MANAGE.DB_NAME
+     * @return the value of TAX_ADMIN.PROJECT_STATUS_MANAGE.PROJECT_ID
      *
      * @mbg.generated
      */
-    public String getDbName() {
-        return dbName;
+    public String getProjectId() {
+        return projectId;
     }
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column TAX_ADMIN.PROJECT_STATUS_MANAGE.DB_NAME
+     * This method sets the value of the database column TAX_ADMIN.PROJECT_STATUS_MANAGE.PROJECT_ID
      *
-     * @param dbName the value for TAX_ADMIN.PROJECT_STATUS_MANAGE.DB_NAME
+     * @param projectId the value for TAX_ADMIN.PROJECT_STATUS_MANAGE.PROJECT_ID
      *
      * @mbg.generated
      */
-    public void setDbName(String dbName) {
-        this.dbName = dbName == null ? null : dbName.trim();
+    public void setProjectId(String projectId) {
+        this.projectId = projectId == null ? null : projectId.trim();
     }
 
     /**
@@ -263,7 +263,7 @@ public class ProjectStatusManage extends BaseEntity implements Serializable {
         sb.append(" [");
         sb.append("Hash = ").append(hashCode());
         sb.append(", id=").append(id);
-        sb.append(", dbName=").append(dbName);
+        sb.append(", projectId=").append(projectId);
         sb.append(", periodId=").append(periodId);
         sb.append(", status=").append(status);
         sb.append(", creatorId=").append(creatorId);

atms-dao/src/main/java/pwc/taxtech/atms/entity/ProjectStatusManageExample.java

@@ -265,73 +265,73 @@ public class ProjectStatusManageExample {
             return (Criteria) this;
         }
 
-        public Criteria andDbNameIsNull() {
-            addCriterion("DB_NAME is null");
+        public Criteria andProjectIdIsNull() {
+            addCriterion("PROJECT_ID is null");
             return (Criteria) this;
         }
 
-        public Criteria andDbNameIsNotNull() {
-            addCriterion("DB_NAME is not null");
+        public Criteria andProjectIdIsNotNull() {
+            addCriterion("PROJECT_ID is not null");
             return (Criteria) this;
         }
 
-        public Criteria andDbNameEqualTo(String value) {
-            addCriterion("DB_NAME =", value, "dbName");
+        public Criteria andProjectIdEqualTo(String value) {
+            addCriterion("PROJECT_ID =", value, "projectId");
             return (Criteria) this;
         }
 
-        public Criteria andDbNameNotEqualTo(String value) {
-            addCriterion("DB_NAME <>", value, "dbName");
+        public Criteria andProjectIdNotEqualTo(String value) {
+            addCriterion("PROJECT_ID <>", value, "projectId");
             return (Criteria) this;
         }
 
-        public Criteria andDbNameGreaterThan(String value) {
-            addCriterion("DB_NAME >", value, "dbName");
+        public Criteria andProjectIdGreaterThan(String value) {
+            addCriterion("PROJECT_ID >", value, "projectId");
             return (Criteria) this;
         }
 
-        public Criteria andDbNameGreaterThanOrEqualTo(String value) {
-            addCriterion("DB_NAME >=", value, "dbName");
+        public Criteria andProjectIdGreaterThanOrEqualTo(String value) {
+            addCriterion("PROJECT_ID >=", value, "projectId");
             return (Criteria) this;
         }
 
-        public Criteria andDbNameLessThan(String value) {
-            addCriterion("DB_NAME <", value, "dbName");
+        public Criteria andProjectIdLessThan(String value) {
+            addCriterion("PROJECT_ID <", value, "projectId");
             return (Criteria) this;
         }
 
-        public Criteria andDbNameLessThanOrEqualTo(String value) {
-            addCriterion("DB_NAME <=", value, "dbName");
+        public Criteria andProjectIdLessThanOrEqualTo(String value) {
+            addCriterion("PROJECT_ID <=", value, "projectId");
             return (Criteria) this;
         }
 
-        public Criteria andDbNameLike(String value) {
-            addCriterion("DB_NAME like", value, "dbName");
+        public Criteria andProjectIdLike(String value) {
+            addCriterion("PROJECT_ID like", value, "projectId");
             return (Criteria) this;
         }
 
-        public Criteria andDbNameNotLike(String value) {
-            addCriterion("DB_NAME not like", value, "dbName");
+        public Criteria andProjectIdNotLike(String value) {
+            addCriterion("PROJECT_ID not like", value, "projectId");
             return (Criteria) this;
         }
 
-        public Criteria andDbNameIn(List<String> values) {
-            addCriterion("DB_NAME in", values, "dbName");
+        public Criteria andProjectIdIn(List<String> values) {
+            addCriterion("PROJECT_ID in", values, "projectId");
             return (Criteria) this;
         }
 
-        public Criteria andDbNameNotIn(List<String> values) {
-            addCriterion("DB_NAME not in", values, "dbName");
+        public Criteria andProjectIdNotIn(List<String> values) {
+            addCriterion("PROJECT_ID not in", values, "projectId");
             return (Criteria) this;
         }
 
-        public Criteria andDbNameBetween(String value1, String value2) {
-            addCriterion("DB_NAME between", value1, value2, "dbName");
+        public Criteria andProjectIdBetween(String value1, String value2) {
+            addCriterion("PROJECT_ID between", value1, value2, "projectId");
             return (Criteria) this;
         }
 
-        public Criteria andDbNameNotBetween(String value1, String value2) {
-            addCriterion("DB_NAME not between", value1, value2, "dbName");
+        public Criteria andProjectIdNotBetween(String value1, String value2) {
+            addCriterion("PROJECT_ID not between", value1, value2, "projectId");
             return (Criteria) this;
         }
 

atms-dao/src/main/java/pwc/taxtech/atms/entity/RegionExample.java

@@ -824,52 +824,52 @@ public class RegionExample {
             return (Criteria) this;
         }
 
-        public Criteria andLongitudeEqualTo(Double value) {
+        public Criteria andLongitudeEqualTo(Float value) {
             addCriterion("LONGITUDE =", value, "longitude");
             return (Criteria) this;
         }
 
-        public Criteria andLongitudeNotEqualTo(Double value) {
+        public Criteria andLongitudeNotEqualTo(Float value) {
             addCriterion("LONGITUDE <>", value, "longitude");
             return (Criteria) this;
         }
 
-        public Criteria andLongitudeGreaterThan(Double value) {
+        public Criteria andLongitudeGreaterThan(Float value) {
             addCriterion("LONGITUDE >", value, "longitude");
             return (Criteria) this;
         }
 
-        public Criteria andLongitudeGreaterThanOrEqualTo(Double value) {
+        public Criteria andLongitudeGreaterThanOrEqualTo(Float value) {
             addCriterion("LONGITUDE >=", value, "longitude");
             return (Criteria) this;
         }
 
-        public Criteria andLongitudeLessThan(Double value) {
+        public Criteria andLongitudeLessThan(Float value) {
             addCriterion("LONGITUDE <", value, "longitude");
             return (Criteria) this;
         }
 
-        public Criteria andLongitudeLessThanOrEqualTo(Double value) {
+        public Criteria andLongitudeLessThanOrEqualTo(Float value) {
             addCriterion("LONGITUDE <=", value, "longitude");
             return (Criteria) this;
         }
 
-        public Criteria andLongitudeIn(List<Double> values) {
+        public Criteria andLongitudeIn(List<Float> values) {
             addCriterion("LONGITUDE in", values, "longitude");
             return (Criteria) this;
         }
 
-        public Criteria andLongitudeNotIn(List<Double> values) {
+        public Criteria andLongitudeNotIn(List<Float> values) {
             addCriterion("LONGITUDE not in", values, "longitude");
             return (Criteria) this;
         }
 
-        public Criteria andLongitudeBetween(Double value1, Double value2) {
+        public Criteria andLongitudeBetween(Float value1, Float value2) {
             addCriterion("LONGITUDE between", value1, value2, "longitude");
             return (Criteria) this;
         }
 
-        public Criteria andLongitudeNotBetween(Double value1, Double value2) {
+        public Criteria andLongitudeNotBetween(Float value1, Float value2) {
             addCriterion("LONGITUDE not between", value1, value2, "longitude");
             return (Criteria) this;
         }
@@ -884,52 +884,52 @@ public class RegionExample {
             return (Criteria) this;
         }
 
-        public Criteria andLatitudeEqualTo(Double value) {
+        public Criteria andLatitudeEqualTo(Float value) {
             addCriterion("LATITUDE =", value, "latitude");
             return (Criteria) this;
         }
 
-        public Criteria andLatitudeNotEqualTo(Double value) {
+        public Criteria andLatitudeNotEqualTo(Float value) {
             addCriterion("LATITUDE <>", value, "latitude");
             return (Criteria) this;
         }
 
-        public Criteria andLatitudeGreaterThan(Double value) {
+        public Criteria andLatitudeGreaterThan(Float value) {
             addCriterion("LATITUDE >", value, "latitude");
             return (Criteria) this;
         }
 
-        public Criteria andLatitudeGreaterThanOrEqualTo(Double value) {
+        public Criteria andLatitudeGreaterThanOrEqualTo(Float value) {
             addCriterion("LATITUDE >=", value, "latitude");
             return (Criteria) this;
         }
 
-        public Criteria andLatitudeLessThan(Double value) {
+        public Criteria andLatitudeLessThan(Float value) {
             addCriterion("LATITUDE <", value, "latitude");
             return (Criteria) this;
         }
 
-        public Criteria andLatitudeLessThanOrEqualTo(Double value) {
+        public Criteria andLatitudeLessThanOrEqualTo(Float value) {
             addCriterion("LATITUDE <=", value, "latitude");
             return (Criteria) this;
         }
 
-        public Criteria andLatitudeIn(List<Double> values) {
+        public Criteria andLatitudeIn(List<Float> values) {
             addCriterion("LATITUDE in", values, "latitude");
             return (Criteria) this;
         }
 
-        public Criteria andLatitudeNotIn(List<Double> values) {
+        public Criteria andLatitudeNotIn(List<Float> values) {
             addCriterion("LATITUDE not in", values, "latitude");
             return (Criteria) this;
         }
 
-        public Criteria andLatitudeBetween(Double value1, Double value2) {
+        public Criteria andLatitudeBetween(Float value1, Float value2) {
             addCriterion("LATITUDE between", value1, value2, "latitude");
             return (Criteria) this;
         }
 
-        public Criteria andLatitudeNotBetween(Double value1, Double value2) {
+        public Criteria andLatitudeNotBetween(Float value1, Float value2) {
             addCriterion("LATITUDE not between", value1, value2, "latitude");
             return (Criteria) this;
         }

atms-dao/src/main/java/pwc/taxtech/atms/entity/RolePermission.java

@@ -4,14 +4,14 @@ import java.io.Serializable;
 
 /**
  * This class was generated by MyBatis Generator.
- * This class corresponds to the database table ROLE_PERMISSION
+ * This class corresponds to the database table TAX_ADMIN.ROLE_PERMISSION
  *
  * @mbg.generated do_not_delete_during_merge
  */
 public class RolePermission extends BaseEntity implements Serializable {
     /**
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column ROLE_PERMISSION.ID
+     * This field corresponds to the database column TAX_ADMIN.ROLE_PERMISSION.ID
      *
      * @mbg.generated
      */
@@ -19,7 +19,7 @@ public class RolePermission extends BaseEntity implements Serializable {
 
     /**
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column ROLE_PERMISSION.ROLE_ID
+     * This field corresponds to the database column TAX_ADMIN.ROLE_PERMISSION.ROLE_ID
      *
      * @mbg.generated
      */
@@ -27,7 +27,7 @@ public class RolePermission extends BaseEntity implements Serializable {
 
     /**
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column ROLE_PERMISSION.PERMISSION_ID
+     * This field corresponds to the database column TAX_ADMIN.ROLE_PERMISSION.PERMISSION_ID
      *
      * @mbg.generated
      */
@@ -35,33 +35,33 @@ public class RolePermission extends BaseEntity implements Serializable {
 
     /**
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table ROLE_PERMISSION
+     * This field corresponds to the database table TAX_ADMIN.ROLE_PERMISSION
      *
      * @mbg.generated
      */
-
-    private Role role;
-
-    private Permission permission;
-
     private static final long serialVersionUID = 1L;
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column ROLE_PERMISSION.ID
+     * This method returns the value of the database column TAX_ADMIN.ROLE_PERMISSION.ID
      *
-     * @return the value of ROLE_PERMISSION.ID
+     * @return the value of TAX_ADMIN.ROLE_PERMISSION.ID
      * @mbg.generated
      */
+
+    private Role role;
+
+    private Permission permission;
+
     public String getId() {
         return id;
     }
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column ROLE_PERMISSION.ID
+     * This method sets the value of the database column TAX_ADMIN.ROLE_PERMISSION.ID
      *
-     * @param id the value for ROLE_PERMISSION.ID
+     * @param id the value for TAX_ADMIN.ROLE_PERMISSION.ID
      * @mbg.generated
      */
     public void setId(String id) {
@@ -70,9 +70,9 @@ public class RolePermission extends BaseEntity implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column ROLE_PERMISSION.ROLE_ID
+     * This method returns the value of the database column TAX_ADMIN.ROLE_PERMISSION.ROLE_ID
      *
-     * @return the value of ROLE_PERMISSION.ROLE_ID
+     * @return the value of TAX_ADMIN.ROLE_PERMISSION.ROLE_ID
      * @mbg.generated
      */
     public String getRoleId() {
@@ -81,9 +81,9 @@ public class RolePermission extends BaseEntity implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column ROLE_PERMISSION.ROLE_ID
+     * This method sets the value of the database column TAX_ADMIN.ROLE_PERMISSION.ROLE_ID
      *
-     * @param roleId the value for ROLE_PERMISSION.ROLE_ID
+     * @param roleId the value for TAX_ADMIN.ROLE_PERMISSION.ROLE_ID
      * @mbg.generated
      */
     public void setRoleId(String roleId) {
@@ -92,9 +92,9 @@ public class RolePermission extends BaseEntity implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column ROLE_PERMISSION.PERMISSION_ID
+     * This method returns the value of the database column TAX_ADMIN.ROLE_PERMISSION.PERMISSION_ID
      *
-     * @return the value of ROLE_PERMISSION.PERMISSION_ID
+     * @return the value of TAX_ADMIN.ROLE_PERMISSION.PERMISSION_ID
      * @mbg.generated
      */
     public String getPermissionId() {
@@ -103,9 +103,9 @@ public class RolePermission extends BaseEntity implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column ROLE_PERMISSION.PERMISSION_ID
+     * This method sets the value of the database column TAX_ADMIN.ROLE_PERMISSION.PERMISSION_ID
      *
-     * @param permissionId the value for ROLE_PERMISSION.PERMISSION_ID
+     * @param permissionId the value for TAX_ADMIN.ROLE_PERMISSION.PERMISSION_ID
      * @mbg.generated
      */
     public void setPermissionId(String permissionId) {
@@ -114,7 +114,7 @@ public class RolePermission extends BaseEntity implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table ROLE_PERMISSION
+     * This method corresponds to the database table TAX_ADMIN.ROLE_PERMISSION
      *
      * @mbg.generated
      */

atms-dao/src/main/java/pwc/taxtech/atms/entity/TemplateGroupExample.java

@@ -775,52 +775,52 @@ public class TemplateGroupExample {
             return (Criteria) this;
         }
 
-        public Criteria andIsSystemTypeEqualTo(Integer value) {
+        public Criteria andIsSystemTypeEqualTo(Boolean value) {
             addCriterion("IS_SYSTEM_TYPE =", value, "isSystemType");
             return (Criteria) this;
         }
 
-        public Criteria andIsSystemTypeNotEqualTo(Integer value) {
+        public Criteria andIsSystemTypeNotEqualTo(Boolean value) {
             addCriterion("IS_SYSTEM_TYPE <>", value, "isSystemType");
             return (Criteria) this;
         }
 
-        public Criteria andIsSystemTypeGreaterThan(Integer value) {
+        public Criteria andIsSystemTypeGreaterThan(Boolean value) {
             addCriterion("IS_SYSTEM_TYPE >", value, "isSystemType");
             return (Criteria) this;
         }
 
-        public Criteria andIsSystemTypeGreaterThanOrEqualTo(Integer value) {
+        public Criteria andIsSystemTypeGreaterThanOrEqualTo(Boolean value) {
             addCriterion("IS_SYSTEM_TYPE >=", value, "isSystemType");
             return (Criteria) this;
         }
 
-        public Criteria andIsSystemTypeLessThan(Integer value) {
+        public Criteria andIsSystemTypeLessThan(Boolean value) {
             addCriterion("IS_SYSTEM_TYPE <", value, "isSystemType");
             return (Criteria) this;
         }
 
-        public Criteria andIsSystemTypeLessThanOrEqualTo(Integer value) {
+        public Criteria andIsSystemTypeLessThanOrEqualTo(Boolean value) {
             addCriterion("IS_SYSTEM_TYPE <=", value, "isSystemType");
             return (Criteria) this;
         }
 
-        public Criteria andIsSystemTypeIn(List<Integer> values) {
+        public Criteria andIsSystemTypeIn(List<Boolean> values) {
             addCriterion("IS_SYSTEM_TYPE in", values, "isSystemType");
             return (Criteria) this;
         }
 
-        public Criteria andIsSystemTypeNotIn(List<Integer> values) {
+        public Criteria andIsSystemTypeNotIn(List<Boolean> values) {
             addCriterion("IS_SYSTEM_TYPE not in", values, "isSystemType");
             return (Criteria) this;
         }
 
-        public Criteria andIsSystemTypeBetween(Integer value1, Integer value2) {
+        public Criteria andIsSystemTypeBetween(Boolean value1, Boolean value2) {
             addCriterion("IS_SYSTEM_TYPE between", value1, value2, "isSystemType");
             return (Criteria) this;
         }
 
-        public Criteria andIsSystemTypeNotBetween(Integer value1, Integer value2) {
+        public Criteria andIsSystemTypeNotBetween(Boolean value1, Boolean value2) {
             addCriterion("IS_SYSTEM_TYPE not between", value1, value2, "isSystemType");
             return (Criteria) this;
         }

atms-dao/src/main/resources/pwc/taxtech/atms/dao/OrganizationMapper.xml

@@ -32,7 +32,7 @@
     <result column="PHONE_NUMBER" jdbcType="VARCHAR" property="phoneNumber" />
     <result column="REGISTRATION_TYPE" jdbcType="VARCHAR" property="registrationType" />
     <result column="REMARK" jdbcType="VARCHAR" property="remark" />
-    <result column="VEHICLE_ROUTING_LOCATION" jdbcType="VARCHAR" property="vehicleroutinglocation" />
+    <result column="VEHICLE_ROUTING_LOCATION" jdbcType="VARCHAR" property="vehicleRoutingLocation" />
     <result column="RATEPAYER" jdbcType="VARCHAR" property="ratepayer" />
     <result column="ADDRESS" jdbcType="VARCHAR" property="address" />
     <result column="FOUNDATION_DATE" jdbcType="TIMESTAMP" property="foundationDate" />
@@ -118,7 +118,7 @@
     INDUSTRY_ID, BUSINESS_UNIT_ID, IS_ACTIVE, P_LEVEL, CREATE_TIME, UPDATE_TIME, AREA_ID, 
     ENGLISH_NAME, ABBREVIATION, INVOICE_TYPE, LEGAL_PERSON_NAME, MANUFACTURE_ADDRESS, 
     REGISTER_ADDRESS, BANK_ACCOUNT_NAME, BANK_ACCOUNT_NUMBER, PHONE_NUMBER, REGISTRATION_TYPE, 
-    REMARK, VEHICLE_ROUTING_LOCATION, RATEPAYER, ADDRESS, FOUNDATION_DATE, REGISTRATION_DATE,
+    REMARK, VEHICLE_ROUTING_LOCATION, RATEPAYER, ADDRESS, FOUNDATION_DATE, REGISTRATION_DATE, 
     REGISTRATION_LOCATION, REGISTRATION_CAPITAL, BUSINESS_ALLOTTED_TIME_FROM, BUSINESS_ALLOTTED_TIME_TO, 
     LEGAL_CODE
   </sql>
@@ -181,7 +181,7 @@
       ENGLISH_NAME, ABBREVIATION, INVOICE_TYPE, 
       LEGAL_PERSON_NAME, MANUFACTURE_ADDRESS, REGISTER_ADDRESS, 
       BANK_ACCOUNT_NAME, BANK_ACCOUNT_NUMBER, PHONE_NUMBER, 
-      REGISTRATION_TYPE, REMARK, VEHICLE_ROUTING_LOCATION,
+      REGISTRATION_TYPE, REMARK, VEHICLE_ROUTING_LOCATION, 
       RATEPAYER, ADDRESS, FOUNDATION_DATE, 
       REGISTRATION_DATE, REGISTRATION_LOCATION, 
       REGISTRATION_CAPITAL, BUSINESS_ALLOTTED_TIME_FROM, 
@@ -194,7 +194,7 @@
       #{englishName,jdbcType=VARCHAR}, #{abbreviation,jdbcType=VARCHAR}, #{invoiceType,jdbcType=VARCHAR}, 
       #{legalPersonName,jdbcType=VARCHAR}, #{manufactureAddress,jdbcType=VARCHAR}, #{registerAddress,jdbcType=VARCHAR}, 
       #{bankAccountName,jdbcType=VARCHAR}, #{bankAccountNumber,jdbcType=VARCHAR}, #{phoneNumber,jdbcType=VARCHAR}, 
-      #{registrationType,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{vehicleroutinglocation,jdbcType=VARCHAR}, 
+      #{registrationType,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{vehicleRoutingLocation,jdbcType=VARCHAR}, 
       #{ratepayer,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, #{foundationDate,jdbcType=TIMESTAMP}, 
       #{registrationDate,jdbcType=TIMESTAMP}, #{registrationLocation,jdbcType=VARCHAR}, 
       #{registrationCapital,jdbcType=VARCHAR}, #{businessAllottedTimeFrom,jdbcType=TIMESTAMP}, 
@@ -285,7 +285,7 @@
       <if test="remark != null">
         REMARK,
       </if>
-      <if test="vehicleroutinglocation != null">
+      <if test="vehicleRoutingLocation != null">
         VEHICLE_ROUTING_LOCATION,
       </if>
       <if test="ratepayer != null">
@@ -395,8 +395,8 @@
       <if test="remark != null">
         #{remark,jdbcType=VARCHAR},
       </if>
-      <if test="vehicleroutinglocation != null">
-        #{vehicleroutinglocation,jdbcType=VARCHAR},
+      <if test="vehicleRoutingLocation != null">
+        #{vehicleRoutingLocation,jdbcType=VARCHAR},
       </if>
       <if test="ratepayer != null">
         #{ratepayer,jdbcType=VARCHAR},
@@ -522,8 +522,8 @@
       <if test="record.remark != null">
         REMARK = #{record.remark,jdbcType=VARCHAR},
       </if>
-      <if test="record.vehicleroutinglocation != null">
-        VEHICLE_ROUTING_LOCATION = #{record.vehicleroutinglocation,jdbcType=VARCHAR},
+      <if test="record.vehicleRoutingLocation != null">
+        VEHICLE_ROUTING_LOCATION = #{record.vehicleRoutingLocation,jdbcType=VARCHAR},
       </if>
       <if test="record.ratepayer != null">
         RATEPAYER = #{record.ratepayer,jdbcType=VARCHAR},
@@ -589,7 +589,7 @@
       PHONE_NUMBER = #{record.phoneNumber,jdbcType=VARCHAR},
       REGISTRATION_TYPE = #{record.registrationType,jdbcType=VARCHAR},
       REMARK = #{record.remark,jdbcType=VARCHAR},
-      VEHICLE_ROUTING_LOCATION = #{record.vehicleroutinglocation,jdbcType=VARCHAR},
+      VEHICLE_ROUTING_LOCATION = #{record.vehicleRoutingLocation,jdbcType=VARCHAR},
       RATEPAYER = #{record.ratepayer,jdbcType=VARCHAR},
       ADDRESS = #{record.address,jdbcType=VARCHAR},
       FOUNDATION_DATE = #{record.foundationDate,jdbcType=TIMESTAMP},
@@ -685,8 +685,8 @@
       <if test="remark != null">
         REMARK = #{remark,jdbcType=VARCHAR},
       </if>
-      <if test="vehicleroutinglocation != null">
-        VEHICLE_ROUTING_LOCATION = #{vehicleroutinglocation,jdbcType=VARCHAR},
+      <if test="vehicleRoutingLocation != null">
+        VEHICLE_ROUTING_LOCATION = #{vehicleRoutingLocation,jdbcType=VARCHAR},
       </if>
       <if test="ratepayer != null">
         RATEPAYER = #{ratepayer,jdbcType=VARCHAR},
@@ -749,7 +749,7 @@
       PHONE_NUMBER = #{phoneNumber,jdbcType=VARCHAR},
       REGISTRATION_TYPE = #{registrationType,jdbcType=VARCHAR},
       REMARK = #{remark,jdbcType=VARCHAR},
-      VEHICLE_ROUTING_LOCATION = #{vehicleroutinglocation,jdbcType=VARCHAR},
+      VEHICLE_ROUTING_LOCATION = #{vehicleRoutingLocation,jdbcType=VARCHAR},
       RATEPAYER = #{ratepayer,jdbcType=VARCHAR},
       ADDRESS = #{address,jdbcType=VARCHAR},
       FOUNDATION_DATE = #{foundationDate,jdbcType=TIMESTAMP},

atms-dao/src/main/resources/pwc/taxtech/atms/dao/ProjectStatusManageMapper.xml

@@ -7,7 +7,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     <id column="ID" jdbcType="VARCHAR" property="id" />
-    <result column="DB_NAME" jdbcType="VARCHAR" property="dbName" />
+    <result column="PROJECT_ID" jdbcType="VARCHAR" property="projectId" />
     <result column="PERIOD_ID" jdbcType="DECIMAL" property="periodId" />
     <result column="STATUS" jdbcType="DECIMAL" property="status" />
     <result column="CREATOR_ID" jdbcType="VARCHAR" property="creatorId" />
@@ -85,7 +85,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    ID, DB_NAME, PERIOD_ID, "STATUS", CREATOR_ID, CREATE_TIME, UPDATE_TIME
+    ID, PROJECT_ID, PERIOD_ID, "STATUS", CREATOR_ID, CREATE_TIME, UPDATE_TIME
   </sql>
   <select id="selectByExample" parameterType="pwc.taxtech.atms.entity.ProjectStatusManageExample" resultMap="BaseResultMap">
     <!--
@@ -138,10 +138,10 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    insert into PROJECT_STATUS_MANAGE (ID, DB_NAME, PERIOD_ID, 
+    insert into PROJECT_STATUS_MANAGE (ID, PROJECT_ID, PERIOD_ID, 
       "STATUS", CREATOR_ID, CREATE_TIME, 
       UPDATE_TIME)
-    values (#{id,jdbcType=VARCHAR}, #{dbName,jdbcType=VARCHAR}, #{periodId,jdbcType=DECIMAL}, 
+    values (#{id,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR}, #{periodId,jdbcType=DECIMAL}, 
       #{status,jdbcType=DECIMAL}, #{creatorId,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{updateTime,jdbcType=TIMESTAMP})
   </insert>
@@ -155,8 +155,8 @@
       <if test="id != null">
         ID,
       </if>
-      <if test="dbName != null">
-        DB_NAME,
+      <if test="projectId != null">
+        PROJECT_ID,
       </if>
       <if test="periodId != null">
         PERIOD_ID,
@@ -178,8 +178,8 @@
       <if test="id != null">
         #{id,jdbcType=VARCHAR},
       </if>
-      <if test="dbName != null">
-        #{dbName,jdbcType=VARCHAR},
+      <if test="projectId != null">
+        #{projectId,jdbcType=VARCHAR},
       </if>
       <if test="periodId != null">
         #{periodId,jdbcType=DECIMAL},
@@ -218,8 +218,8 @@
       <if test="record.id != null">
         ID = #{record.id,jdbcType=VARCHAR},
       </if>
-      <if test="record.dbName != null">
-        DB_NAME = #{record.dbName,jdbcType=VARCHAR},
+      <if test="record.projectId != null">
+        PROJECT_ID = #{record.projectId,jdbcType=VARCHAR},
       </if>
       <if test="record.periodId != null">
         PERIOD_ID = #{record.periodId,jdbcType=DECIMAL},
@@ -248,7 +248,7 @@
     -->
     update PROJECT_STATUS_MANAGE
     set ID = #{record.id,jdbcType=VARCHAR},
-      DB_NAME = #{record.dbName,jdbcType=VARCHAR},
+      PROJECT_ID = #{record.projectId,jdbcType=VARCHAR},
       PERIOD_ID = #{record.periodId,jdbcType=DECIMAL},
       "STATUS" = #{record.status,jdbcType=DECIMAL},
       CREATOR_ID = #{record.creatorId,jdbcType=VARCHAR},
@@ -265,8 +265,8 @@
     -->
     update PROJECT_STATUS_MANAGE
     <set>
-      <if test="dbName != null">
-        DB_NAME = #{dbName,jdbcType=VARCHAR},
+      <if test="projectId != null">
+        PROJECT_ID = #{projectId,jdbcType=VARCHAR},
       </if>
       <if test="periodId != null">
         PERIOD_ID = #{periodId,jdbcType=DECIMAL},
@@ -292,7 +292,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     update PROJECT_STATUS_MANAGE
-    set DB_NAME = #{dbName,jdbcType=VARCHAR},
+    set PROJECT_ID = #{projectId,jdbcType=VARCHAR},
       PERIOD_ID = #{periodId,jdbcType=DECIMAL},
       "STATUS" = #{status,jdbcType=DECIMAL},
       CREATOR_ID = #{creatorId,jdbcType=VARCHAR},