dao|表字段调整

zelong.shao
Commit 270519c02c207546c720767e3a1b5951869a6cc2 270519c0 1 parent ced956b9
Showing 4 changed files with 66 additions and 66 deletions
server/common-dao/src/main/java/com/fedex/connect/common/mapper/sys/UserMapper.xml
server/common-dao/src/main/java/com/fedex/connect/common/model/sys/User.java
server/common-dao/src/main/java/com/fedex/connect/common/model/sys/UserExample.java
server/common-dao/src/main/resources/generatorConfig.xml
--- a/server/common-dao/src/main/java/com/fedex/connect/common/mapper/sys/UserMapper.xml
View file @270519c
+++ b/server/common-dao/src/main/java/com/fedex/connect/common/mapper/sys/UserMapper.xml
View file @270519c
@@ -9,7 +9,7 @@
     <result column="USER_UUID" jdbcType="VARCHAR" property="userUuid" />
     <result column="EMAIL" jdbcType="VARCHAR" property="email" />
     <result column="PHONE" jdbcType="VARCHAR" property="phone" />
-    <result column="COMPANNY_NAME" jdbcType="VARCHAR" property="compannyName" />
+    <result column="COMPANY_NAME" jdbcType="VARCHAR" property="companyName" />
     <result column="ACCOUNT_NO" jdbcType="VARCHAR" property="accountNo" />
     <result column="UNIFIED_BUSINESS_NUM" jdbcType="VARCHAR" property="unifiedBusinessNum" />
     <result column="CUSTOMS_SERIAL_NUM" jdbcType="VARCHAR" property="customsSerialNum" />
@@ -83,7 +83,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    ID, LOGIN_NAME, USER_NAME, PASSWORD, USER_UUID, EMAIL, PHONE, COMPANNY_NAME, ACCOUNT_NO, 
+    ID, LOGIN_NAME, USER_NAME, PASSWORD, USER_UUID, EMAIL, PHONE, COMPANY_NAME, ACCOUNT_NO, 
     UNIFIED_BUSINESS_NUM, CUSTOMS_SERIAL_NUM, TYPE_ID, TYPE_NAME, STATUS, REMARK, CREATE_TIME, 
     CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME
   </sql>
@@ -126,7 +126,7 @@
     </selectKey>
     insert into ICLEARIMP.T_SYS_USER (ID, LOGIN_NAME, USER_NAME, 
       PASSWORD, USER_UUID, EMAIL, 
-      PHONE, COMPANNY_NAME, ACCOUNT_NO, 
+      PHONE, COMPANY_NAME, ACCOUNT_NO, 
       UNIFIED_BUSINESS_NUM, CUSTOMS_SERIAL_NUM, TYPE_ID, 
       TYPE_NAME, STATUS, REMARK, 
       CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, 
@@ -134,7 +134,7 @@
       )
     values (#{id,jdbcType=NUMERIC}, #{loginName,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, 
       #{password,jdbcType=VARCHAR}, #{userUuid,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, 
-      #{phone,jdbcType=VARCHAR}, #{compannyName,jdbcType=VARCHAR}, #{accountNo,jdbcType=VARCHAR}, 
+      #{phone,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, #{accountNo,jdbcType=VARCHAR}, 
       #{unifiedBusinessNum,jdbcType=VARCHAR}, #{customsSerialNum,jdbcType=VARCHAR}, #{typeId,jdbcType=NUMERIC}, 
       #{typeName,jdbcType=VARCHAR}, #{status,jdbcType=NUMERIC}, #{remark,jdbcType=VARCHAR}, 
       #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR}, 
@@ -166,8 +166,8 @@
       <if test="phone != null">
         PHONE,
       </if>
-      <if test="compannyName != null">
+      <if test="companyName != null">
-        COMPANNY_NAME,
+        COMPANY_NAME,
       </if>
       <if test="accountNo != null">
         ACCOUNT_NO,
@@ -229,8 +229,8 @@
       <if test="phone != null">
         #{phone,jdbcType=VARCHAR},
       </if>
-      <if test="compannyName != null">
+      <if test="companyName != null">
-        #{compannyName,jdbcType=VARCHAR},
+        #{companyName,jdbcType=VARCHAR},
       </if>
       <if test="accountNo != null">
         #{accountNo,jdbcType=VARCHAR},
@@ -303,8 +303,8 @@
       <if test="record.phone != null">
         PHONE = #{record.phone,jdbcType=VARCHAR},
       </if>
-      <if test="record.compannyName != null">
+      <if test="record.companyName != null">
-        COMPANNY_NAME = #{record.compannyName,jdbcType=VARCHAR},
+        COMPANY_NAME = #{record.companyName,jdbcType=VARCHAR},
       </if>
       <if test="record.accountNo != null">
         ACCOUNT_NO = #{record.accountNo,jdbcType=VARCHAR},
@@ -359,7 +359,7 @@
       USER_UUID = #{record.userUuid,jdbcType=VARCHAR},
       EMAIL = #{record.email,jdbcType=VARCHAR},
       PHONE = #{record.phone,jdbcType=VARCHAR},
-      COMPANNY_NAME = #{record.compannyName,jdbcType=VARCHAR},
+      COMPANY_NAME = #{record.companyName,jdbcType=VARCHAR},
       ACCOUNT_NO = #{record.accountNo,jdbcType=VARCHAR},
       UNIFIED_BUSINESS_NUM = #{record.unifiedBusinessNum,jdbcType=VARCHAR},
       CUSTOMS_SERIAL_NUM = #{record.customsSerialNum,jdbcType=VARCHAR},
@@ -398,8 +398,8 @@
       <if test="phone != null">
         PHONE = #{phone,jdbcType=VARCHAR},
       </if>
-      <if test="compannyName != null">
+      <if test="companyName != null">
-        COMPANNY_NAME = #{compannyName,jdbcType=VARCHAR},
+        COMPANY_NAME = #{companyName,jdbcType=VARCHAR},
       </if>
       <if test="accountNo != null">
         ACCOUNT_NO = #{accountNo,jdbcType=VARCHAR},
@@ -451,7 +451,7 @@
       USER_UUID = #{userUuid,jdbcType=VARCHAR},
       EMAIL = #{email,jdbcType=VARCHAR},
       PHONE = #{phone,jdbcType=VARCHAR},
-      COMPANNY_NAME = #{compannyName,jdbcType=VARCHAR},
+      COMPANY_NAME = #{companyName,jdbcType=VARCHAR},
       ACCOUNT_NO = #{accountNo,jdbcType=VARCHAR},
       UNIFIED_BUSINESS_NUM = #{unifiedBusinessNum,jdbcType=VARCHAR},
       CUSTOMS_SERIAL_NUM = #{customsSerialNum,jdbcType=VARCHAR},
--- a/server/common-dao/src/main/java/com/fedex/connect/common/model/sys/User.java
View file @270519c
+++ b/server/common-dao/src/main/java/com/fedex/connect/common/model/sys/User.java
View file @270519c
@@ -46,7 +46,7 @@ public class User implements Serializable {
     /**
      * 公司名称
      */
-    private String compannyName;
+    private String companyName;
     /**
      * 计费账号
@@ -172,12 +172,12 @@ public class User implements Serializable {
         this.phone = phone == null ? null : phone.trim();
     }
-    public String getCompannyName() {
+    public String getCompanyName() {
-        return compannyName;
+        return companyName;
     }
-    public void setCompannyName(String compannyName) {
+    public void setCompanyName(String companyName) {
-        this.compannyName = compannyName == null ? null : compannyName.trim();
+        this.companyName = companyName == null ? null : companyName.trim();
     }
     public String getAccountNo() {
@@ -297,7 +297,7 @@ public class User implements Serializable {
         sb.append(", userUuid=").append(userUuid);
         sb.append(", email=").append(email);
         sb.append(", phone=").append(phone);
-        sb.append(", compannyName=").append(compannyName);
+        sb.append(", companyName=").append(companyName);
         sb.append(", accountNo=").append(accountNo);
         sb.append(", unifiedBusinessNum=").append(unifiedBusinessNum);
         sb.append(", customsSerialNum=").append(customsSerialNum);
--- a/server/common-dao/src/main/java/com/fedex/connect/common/model/sys/UserExample.java
View file @270519c
+++ b/server/common-dao/src/main/java/com/fedex/connect/common/model/sys/UserExample.java
View file @270519c
@@ -605,73 +605,73 @@ public class UserExample {
             return (Criteria) this;
         }
-        public Criteria andCompannyNameIsNull() {
+        public Criteria andCompanyNameIsNull() {
-            addCriterion("COMPANNY_NAME is null");
+            addCriterion("COMPANY_NAME is null");
             return (Criteria) this;
         }
-        public Criteria andCompannyNameIsNotNull() {
+        public Criteria andCompanyNameIsNotNull() {
-            addCriterion("COMPANNY_NAME is not null");
+            addCriterion("COMPANY_NAME is not null");
             return (Criteria) this;
         }
-        public Criteria andCompannyNameEqualTo(String value) {
+        public Criteria andCompanyNameEqualTo(String value) {
-            addCriterion("COMPANNY_NAME =", value, "compannyName");
+            addCriterion("COMPANY_NAME =", value, "companyName");
             return (Criteria) this;
         }
-        public Criteria andCompannyNameNotEqualTo(String value) {
+        public Criteria andCompanyNameNotEqualTo(String value) {
-            addCriterion("COMPANNY_NAME <>", value, "compannyName");
+            addCriterion("COMPANY_NAME <>", value, "companyName");
             return (Criteria) this;
         }
-        public Criteria andCompannyNameGreaterThan(String value) {
+        public Criteria andCompanyNameGreaterThan(String value) {
-            addCriterion("COMPANNY_NAME >", value, "compannyName");
+            addCriterion("COMPANY_NAME >", value, "companyName");
             return (Criteria) this;
         }
-        public Criteria andCompannyNameGreaterThanOrEqualTo(String value) {
+        public Criteria andCompanyNameGreaterThanOrEqualTo(String value) {
-            addCriterion("COMPANNY_NAME >=", value, "compannyName");
+            addCriterion("COMPANY_NAME >=", value, "companyName");
             return (Criteria) this;
         }
-        public Criteria andCompannyNameLessThan(String value) {
+        public Criteria andCompanyNameLessThan(String value) {
-            addCriterion("COMPANNY_NAME <", value, "compannyName");
+            addCriterion("COMPANY_NAME <", value, "companyName");
             return (Criteria) this;
         }
-        public Criteria andCompannyNameLessThanOrEqualTo(String value) {
+        public Criteria andCompanyNameLessThanOrEqualTo(String value) {
-            addCriterion("COMPANNY_NAME <=", value, "compannyName");
+            addCriterion("COMPANY_NAME <=", value, "companyName");
             return (Criteria) this;
         }
-        public Criteria andCompannyNameLike(String value) {
+        public Criteria andCompanyNameLike(String value) {
-            addCriterion("COMPANNY_NAME like", value, "compannyName");
+            addCriterion("COMPANY_NAME like", value, "companyName");
             return (Criteria) this;
         }
-        public Criteria andCompannyNameNotLike(String value) {
+        public Criteria andCompanyNameNotLike(String value) {
-            addCriterion("COMPANNY_NAME not like", value, "compannyName");
+            addCriterion("COMPANY_NAME not like", value, "companyName");
             return (Criteria) this;
         }
-        public Criteria andCompannyNameIn(List<String> values) {
+        public Criteria andCompanyNameIn(List<String> values) {
-            addCriterion("COMPANNY_NAME in", values, "compannyName");
+            addCriterion("COMPANY_NAME in", values, "companyName");
             return (Criteria) this;
         }
-        public Criteria andCompannyNameNotIn(List<String> values) {
+        public Criteria andCompanyNameNotIn(List<String> values) {
-            addCriterion("COMPANNY_NAME not in", values, "compannyName");
+            addCriterion("COMPANY_NAME not in", values, "companyName");
             return (Criteria) this;
         }
-        public Criteria andCompannyNameBetween(String value1, String value2) {
+        public Criteria andCompanyNameBetween(String value1, String value2) {
-            addCriterion("COMPANNY_NAME between", value1, value2, "compannyName");
+            addCriterion("COMPANY_NAME between", value1, value2, "companyName");
             return (Criteria) this;
         }
-        public Criteria andCompannyNameNotBetween(String value1, String value2) {
+        public Criteria andCompanyNameNotBetween(String value1, String value2) {
-            addCriterion("COMPANNY_NAME not between", value1, value2, "compannyName");
+            addCriterion("COMPANY_NAME not between", value1, value2, "companyName");
             return (Criteria) this;
         }
--- a/server/common-dao/src/main/resources/generatorConfig.xml
View file @270519c
+++ b/server/common-dao/src/main/resources/generatorConfig.xml
View file @270519c
@@ -137,24 +137,24 @@
 <!--                      selectByExampleQueryId="true">-->
 <!--                   <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_REDIS_SLAB.NEXTVAL FROM DUAL" />-->
 <!--               </table>-->
-        <table schema="ICLEARIMP" tableName="T_SYS_KAFKA_STORAGE_HISTORY" domainObjectName="KafkaStorageHistory"
+<!--        <table schema="ICLEARIMP" tableName="T_SYS_KAFKA_STORAGE_HISTORY" domainObjectName="KafkaStorageHistory"-->
-               enableCountByExample="true" enableUpdateByExample="true"
+<!--               enableCountByExample="true" enableUpdateByExample="true"-->
-               enableDeleteByExample="true" enableSelectByExample="true"
+<!--               enableDeleteByExample="true" enableSelectByExample="true"-->
-               selectByExampleQueryId="true">
+<!--               selectByExampleQueryId="true">-->
-            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_KAFKA_STORAGE_HISTORY.NEXTVAL FROM DUAL" />
+<!--            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_KAFKA_STORAGE_HISTORY.NEXTVAL FROM DUAL" />-->
-        </table>
+<!--        </table>-->
 <!--        <table tableName="T_SYS_KAFKA_TEMPORARY_STORAGE" domainObjectName="KafkaTemporaryStorage"-->
 <!--               enableCountByExample="true" enableUpdateByExample="true"-->
 <!--               enableDeleteByExample="true" enableSelectByExample="true"-->
 <!--               selectByExampleQueryId="true">-->
 <!--            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_KAFKA_TEMPORARY_STORAGE.NEXTVAL FROM DUAL" />-->
 <!--        </table>-->
-        <table schema="ICLEARIMP" tableName="T_SYS_PARAM_CONFIG" domainObjectName="ParamConfig"
+<!--        <table schema="ICLEARIMP" tableName="T_SYS_PARAM_CONFIG" domainObjectName="ParamConfig"-->
-               enableCountByExample="true" enableUpdateByExample="true"
+<!--               enableCountByExample="true" enableUpdateByExample="true"-->
-               enableDeleteByExample="true" enableSelectByExample="true"
+<!--               enableDeleteByExample="true" enableSelectByExample="true"-->
-               selectByExampleQueryId="true">
+<!--               selectByExampleQueryId="true">-->
-            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_PARAM_CONFIG.NEXTVAL FROM DUAL" />
+<!--            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_PARAM_CONFIG.NEXTVAL FROM DUAL" />-->
-        </table>
+<!--        </table>-->
 <!--        <table tableName="T_SYS_PRIVILEGE" domainObjectName="Privilege"-->
 <!--               enableCountByExample="true" enableUpdateByExample="true"-->
 <!--               enableDeleteByExample="true" enableSelectByExample="true"-->
@@ -179,12 +179,12 @@
                selectByExampleQueryId="true">
             <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_USER.NEXTVAL FROM DUAL" />
         </table>
-        <table schema="ICLEARIMP" tableName="T_SYS_USER_ROLE" domainObjectName="UserRole"
+<!--        <table schema="ICLEARIMP" tableName="T_SYS_USER_ROLE" domainObjectName="UserRole"-->
-               enableCountByExample="true" enableUpdateByExample="true"
+<!--               enableCountByExample="true" enableUpdateByExample="true"-->
-               enableDeleteByExample="true" enableSelectByExample="true"
+<!--               enableDeleteByExample="true" enableSelectByExample="true"-->
-               selectByExampleQueryId="true">
+<!--               selectByExampleQueryId="true">-->
-            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_USER_ROLE.NEXTVAL FROM DUAL" />
+<!--            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_USER_ROLE.NEXTVAL FROM DUAL" />-->
-        </table>
+<!--        </table>-->
 <!--        <table tableName="T_BI_DICTIONARY_ENTRIES" domainObjectName="DictionaryEntries"-->