修改AST_TYPE_CODE为AST_TYPE

app/common/dal/dalgen/AbssqrCoreTables/ABS_AST_POOL.xml

@@ -3,14 +3,14 @@
     <!--  特殊字符说明 &lt;&gt; <> -->
     <!-- baseSql option中 select * 会自动替换为 include -->
     <sql id="Base_Column_List">
-        ID,AST_POOL_NO,GMT_CREATE,AST_POOL_NAME,AST_TYPE_CODE
+        ID,AST_POOL_NO,GMT_CREATE,AST_POOL_NAME,AST_TYPE
         ,PROD_NO
         ,GMT_MODIFIED
     </sql>
 
     <!-- baseSql option中 select sf.* 会自动替换为 include -->
     <sql id="Base_SF_Column_List">
-        sf.ID,sf.AST_POOL_NO,sf.GMT_CREATE,sf.AST_POOL_NAME,sf.AST_TYPE_CODE
+        sf.ID,sf.AST_POOL_NO,sf.GMT_CREATE,sf.AST_POOL_NAME,sf.AST_TYPE
         ,PROD_NO
         ,sf.GMT_MODIFIED
     </sql>
@@ -22,7 +22,7 @@
                     ,AST_POOL_NO
                     ,GMT_CREATE
                     ,AST_POOL_NAME
-                    ,AST_TYPE_CODE
+                    ,AST_TYPE
                     ,PROD_NO
                     ,GMT_MODIFIED
             )VALUES(
@@ -46,7 +46,7 @@
                 ,AST_POOL_NO
                 ,GMT_CREATE
                 ,AST_POOL_NAME
-                ,AST_TYPE_CODE
+                ,AST_TYPE
                 ,PROD_NO
                 ,GMT_MODIFIED
             )VALUES
@@ -69,7 +69,7 @@
         SET
             AST_POOL_NO     = #{astPoolNo,jdbcType=VARCHAR}
             ,AST_POOL_NAME   = #{astPoolName,jdbcType=VARCHAR}
-            ,AST_TYPE_CODE   = #{astTypeCode,jdbcType=VARCHAR}
+            ,AST_TYPE   = #{astTypeCode,jdbcType=VARCHAR}
             ,GMT_MODIFIED    = sysdate
         WHERE
             ID              = #{id,jdbcType=DECIMAL}

app/common/dal/src/main/java/com/abssqr/plat/common/dal/mysql/auto/dataobject/AstPoolDO.java

@@ -16,6 +16,10 @@ public class AstPoolDO{
      */
     private String prodNo;
     /**
+     * astType 准入资产代码.
+     */
+    private String astType;
+    /**
      * astPoolNo 资产池编号.
      */
     private String astPoolNo;
@@ -24,10 +28,6 @@ public class AstPoolDO{
      */
     private String astPoolName;
     /**
-     * astTypeCode 准入资产代码.
-     */
-    private String astTypeCode;
-    /**
      * gmtCreate 创建时间.
      */
     private Date gmtCreate;
@@ -69,6 +69,22 @@ public class AstPoolDO{
     }
 
     /**
+     * Set astType 准入资产代码.
+     */
+    public void setAstType(String astType){
+        this.astType = astType;
+    }
+
+    /**
+     * Get astType 准入资产代码.
+     *
+     * @return the string
+     */
+    public String getAstType(){
+        return astType;
+    }
+
+    /**
      * Set astPoolNo 资产池编号.
      */
     public void setAstPoolNo(String astPoolNo){
@@ -101,22 +117,6 @@ public class AstPoolDO{
     }
 
     /**
-     * Set astTypeCode 准入资产代码.
-     */
-    public void setAstTypeCode(String astTypeCode){
-        this.astTypeCode = astTypeCode;
-    }
-
-    /**
-     * Get astTypeCode 准入资产代码.
-     *
-     * @return the string
-     */
-    public String getAstTypeCode(){
-        return astTypeCode;
-    }
-
-    /**
      * Set gmtCreate 创建时间.
      */
     public void setGmtCreate(Date gmtCreate){

app/common/dal/src/main/resources/com/abssqr/plat/common/dal/mysql/auto/mapper/AstPoolDOMapper.xml

@@ -5,21 +5,21 @@
     <resultMap id="BaseResultMap"  type="com.abssqr.plat.common.dal.mysql.auto.dataobject.AstPoolDO">
         <id column="ID" property="id" jdbcType="DECIMAL" javaType="Long"/>
         <result column="PROD_NO" property="prodNo" jdbcType="VARCHAR" javaType="String"/>
+        <result column="AST_TYPE" property="astType" jdbcType="VARCHAR" javaType="String"/>
         <result column="AST_POOL_NO" property="astPoolNo" jdbcType="VARCHAR" javaType="String"/>
         <result column="AST_POOL_NAME" property="astPoolName" jdbcType="VARCHAR" javaType="String"/>
-        <result column="AST_TYPE_CODE" property="astTypeCode" jdbcType="VARCHAR" javaType="String"/>
         <result column="GMT_CREATE" property="gmtCreate" jdbcType="DATE" javaType="java.util.Date"/>
         <result column="GMT_MODIFIED" property="gmtModified" jdbcType="DATE" javaType="java.util.Date"/>
     </resultMap>
 
 
     <sql id="Base_SF_Column_List">
-        sf.ID,sf.AST_POOL_NO,sf.GMT_CREATE,sf.AST_POOL_NAME,sf.AST_TYPE_CODE
+        sf.ID,sf.AST_POOL_NO,sf.GMT_CREATE,sf.AST_POOL_NAME,sf.AST_TYPE
         ,PROD_NO
         ,sf.GMT_MODIFIED
     </sql>
     <sql id="Base_Column_List">
-        ID,AST_POOL_NO,GMT_CREATE,AST_POOL_NAME,AST_TYPE_CODE
+        ID,AST_POOL_NO,GMT_CREATE,AST_POOL_NAME,AST_TYPE
         ,PROD_NO
         ,GMT_MODIFIED
     </sql>
@@ -33,7 +33,7 @@
                     ,AST_POOL_NO
                     ,GMT_CREATE
                     ,AST_POOL_NAME
-                    ,AST_TYPE_CODE
+                    ,AST_TYPE
                     ,PROD_NO
                     ,GMT_MODIFIED
             )VALUES(
@@ -57,7 +57,7 @@
                 ,AST_POOL_NO
                 ,GMT_CREATE
                 ,AST_POOL_NAME
-                ,AST_TYPE_CODE
+                ,AST_TYPE
                 ,PROD_NO
                 ,GMT_MODIFIED
             )VALUES

app/common/model/src/main/java/com/abssqr/plat/common/model/convertor/AstPoolConvert.java

@@ -27,7 +27,7 @@ public class AstPoolConvert {
         AstPoolEntity result  = new AstPoolEntity();
         result.setAstPoolName(param.getAstPoolName());
         result.setAstPoolNo(param.getAstPoolNo());
-        result.setAstTypeEnum(AstTypeEnum.getByCode(param.getAstTypeCode()));
+        result.setAstTypeEnum(AstTypeEnum.getByCode(param.getAstType()));
         result.setProdNo(param.getProdNo());
         return result;
     }
@@ -37,7 +37,7 @@ public class AstPoolConvert {
             return null;
         }
         AstPoolDO result=new AstPoolDO();
-        result.setAstTypeCode(astPoolEntity.getAstTypeEnum().getCode());
+        result.setAstType(astPoolEntity.getAstTypeEnum().getCode());
         result.setAstPoolNo(astPoolEntity.getAstPoolNo());
         result.setAstPoolName(astPoolEntity.getAstPoolName());
         result.setProdNo(astPoolEntity.getProdNo());
@@ -49,7 +49,7 @@ public class AstPoolConvert {
             return null;
         }
         AstPoolVO result =new AstPoolVO();
-        result.setAstTypeName(AstTypeEnum.getByCode(param.getAstTypeCode()).getDesc());
+        result.setAstTypeName(AstTypeEnum.getByCode(param.getAstType()).getDesc());
         result.setAstPoolName(param.getAstPoolName());
         result.setProdNo(param.getProdNo());
         return result;

doc/一期/ABS_AST_POOL.sql

-  drop table ABS_AST_POOL;
+  drop table ABS_AST_POOL;
@@ -4,7 +4,7 @@
   CREATE TABLE ABS_AST_POOL
    (  ID NUMBER(10,0) NOT NULL,
       AST_POOL_NAME VARCHAR2(128) NOT NULL,
-      AST_TYPE_CODE VARCHAR2(128) NOT NULL,
+      AST_TYPE VARCHAR2(128) NOT NULL,
       AST_POOL_NO VARCHAR2(128) NOT NULL,
       GMT_CREATE DATE,
       GMT_MODIFIED DATE,