U 更新 资产包代码

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

@@ -3,16 +3,16 @@
     <!--  特殊字符说明 &lt;&gt; <> -->
     <!-- baseSql option中 select * 会自动替换为 include -->
     <sql id="Base_Column_List">
-        ID,AVAL_AMT,TYPE,PACK_NO,PLAN_NO 
+        ID,AVAL_AMT,PACK_TYPE,PACK_NO,PLAN_NO 
         ,STATUS,PACK_NAME,AST_POOL_NO,PACK_DATE,GMT_CREATE 
-        ,GMT_MODIFIED,PACK_SUBMIT_DATE,AST_TYPE_CODE
+        ,GMT_MODIFIED,PACK_SUBMIT_DATE,AST_TYPE
     </sql>
 
     <!-- baseSql option中 select sf.* 会自动替换为 include -->
     <sql id="Base_SF_Column_List">
-        sf.ID,sf.AVAL_AMT,sf.TYPE,sf.PACK_NO,sf.PLAN_NO 
+        sf.ID,sf.AVAL_AMT,sf.PACK_TYPE,sf.PACK_NO,sf.PLAN_NO 
         ,sf.STATUS,sf.PACK_NAME,sf.AST_POOL_NO,sf.PACK_DATE,sf.GMT_CREATE 
-        ,sf.GMT_MODIFIED,sf.PACK_SUBMIT_DATE,sf.AST_TYPE_CODE
+        ,sf.GMT_MODIFIED,sf.PACK_SUBMIT_DATE,sf.AST_TYPE
     </sql>
 
     <operation name="insert" paramtype="object" remark="插入表:abs_ast_pack" >
@@ -20,7 +20,7 @@
             INSERT INTO abs_ast_pack(
                     ID
                     ,AVAL_AMT
-                    ,TYPE
+                    ,PACK_TYPE
                     ,PACK_NO
                     ,PLAN_NO
                     ,STATUS
@@ -30,11 +30,11 @@
                     ,GMT_CREATE
                     ,GMT_MODIFIED
                     ,PACK_SUBMIT_DATE
-                    ,AST_TYPE_CODE
+                    ,AST_TYPE
             )VALUES(
                       SEQ_ABS_AST_PACK.nextval 
                     ,  #{avalAmt,jdbcType=DECIMAL}
-                    ,  #{type,jdbcType=VARCHAR}
+                    ,  #{packType,jdbcType=VARCHAR}
                     ,  #{packNo,jdbcType=VARCHAR}
                     ,  #{planNo,jdbcType=VARCHAR}
                     ,  #{status,jdbcType=VARCHAR}
@@ -44,7 +44,7 @@
                     ,  sysdate
                     ,  sysdate
                     ,  #{packSubmitDate,jdbcType=DATE}
-                    ,  #{astTypeCode,jdbcType=VARCHAR}
+                    ,  #{astType,jdbcType=VARCHAR}
             )
             ]]>
     </operation>
@@ -56,7 +56,7 @@
             INSERT INTO abs_ast_pack(
                 ID
                 ,AVAL_AMT
-                ,TYPE
+                ,PACK_TYPE
                 ,PACK_NO
                 ,PLAN_NO
                 ,STATUS
@@ -66,12 +66,12 @@
                 ,GMT_CREATE
                 ,GMT_MODIFIED
                 ,PACK_SUBMIT_DATE
-                ,AST_TYPE_CODE
+                ,AST_TYPE
             )VALUES
             (
              null
             , #{item.avalAmt,jdbcType=DECIMAL}
-            , #{item.type,jdbcType=VARCHAR}
+            , #{item.packType,jdbcType=VARCHAR}
             , #{item.packNo,jdbcType=VARCHAR}
             , #{item.planNo,jdbcType=VARCHAR}
             , #{item.status,jdbcType=VARCHAR}
@@ -81,7 +81,7 @@
             , sysdate
             , sysdate
             , #{item.packSubmitDate,jdbcType=DATE}
-            , #{item.astTypeCode,jdbcType=VARCHAR}
+            , #{item.astType,jdbcType=VARCHAR}
             )
     </foreach>
     </operation>
@@ -129,7 +129,7 @@
         UPDATE abs_ast_pack
         SET
             AVAL_AMT        = #{avalAmt,jdbcType=DECIMAL}
-            ,TYPE            = #{type,jdbcType=VARCHAR}
+            ,PACK_TYPE       = #{packType,jdbcType=VARCHAR}
             ,PLAN_NO         = #{planNo,jdbcType=VARCHAR}
             ,STATUS          = #{status,jdbcType=VARCHAR}
             ,PACK_NAME       = #{packName,jdbcType=VARCHAR}
@@ -137,7 +137,7 @@
             ,PACK_DATE       = #{packDate,jdbcType=DATE}
             ,GMT_MODIFIED    = sysdate
             ,PACK_SUBMIT_DATE = #{packSubmitDate,jdbcType=DATE}
-            ,AST_TYPE_CODE   = #{astTypeCode,jdbcType=VARCHAR}
+            ,AST_TYPE   = #{astType,jdbcType=VARCHAR}
         WHERE
             PACK_NO         = #{packNo,jdbcType=VARCHAR}
         ]]>
@@ -190,7 +190,9 @@
           *
         FROM
           ABS_AST_PACK
-        <where>
+        WHERE
+          PACK_TYPE != 'default'
+          AND status not in('publish')
             <if test="packNo != null and packNo != ''">
                 AND PACK_NO like  '%'||#{packNo,jdbcType=VARCHAR}||'%'
             </if>
@@ -203,7 +205,6 @@
                     #{item,jdbcType=VARCHAR}
                 </foreach>
             </if>
-        </where>
         ORDER BY ID DESC
     </operation>
 </table>

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

@@ -27,7 +27,7 @@
                     ,  #{astPoolNo,jdbcType=VARCHAR}
                     ,  sysdate
                     ,  #{astPoolName,jdbcType=VARCHAR}
-                    ,  #{astTypeCode,jdbcType=VARCHAR}
+                    ,  #{astType,jdbcType=VARCHAR}
                     ,  sysdate
             )
             ]]>
@@ -50,7 +50,7 @@
             , #{item.astPoolNo,jdbcType=VARCHAR}
             , sysdate
             , #{item.astPoolName,jdbcType=VARCHAR}
-            , #{item.astTypeCode,jdbcType=VARCHAR}
+            , #{item.astType,jdbcType=VARCHAR}
             , sysdate
             )
     </foreach>
@@ -63,7 +63,7 @@
         SET
             AST_POOL_NO     = #{astPoolNo,jdbcType=VARCHAR}
             ,AST_POOL_NAME   = #{astPoolName,jdbcType=VARCHAR}
-            ,AST_TYPE_CODE   = #{astTypeCode,jdbcType=VARCHAR}
+            ,AST_TYPE_CODE   = #{astType,jdbcType=VARCHAR}
             ,GMT_MODIFIED    = sysdate
         WHERE
             ID              = #{id,jdbcType=DECIMAL}

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

@@ -16,10 +16,6 @@ public class AstPackDO{
      */
     private Long avalAmt;
     /**
-     * type 资产包类型: 1. 正常 NORMAL 2.默认(虚拟) DEFAULT.
-     */
-    private String type;
-    /**
      * packNo 资产包编号.
      */
     private String packNo;
@@ -32,17 +28,21 @@ public class AstPackDO{
      */
     private String status;
     /**
+     * astType 准入资产代码.
+     */
+    private String astType;
+    /**
      * packName 资产包名称.
      */
     private String packName;
     /**
-     * astPoolNo 资产池编号.
+     * packType 资产包类型: 1. 正常 NORMAL 2.默认(虚拟) DEFAULT.
      */
-    private String astPoolNo;
+    private String packType;
     /**
-     * astTypeCode 准入资产代码.
+     * astPoolNo 资产池编号.
      */
-    private String astTypeCode;
+    private String astPoolNo;
     /**
      * packDate 封包日.
      */
@@ -93,22 +93,6 @@ public class AstPackDO{
     }
 
     /**
-     * Set type 资产包类型: 1. 正常 NORMAL 2.默认(虚拟) DEFAULT.
-     */
-    public void setType(String type){
-        this.type = type;
-    }
-
-    /**
-     * Get type 资产包类型: 1. 正常 NORMAL 2.默认(虚拟) DEFAULT.
-     *
-     * @return the string
-     */
-    public String getType(){
-        return type;
-    }
-
-    /**
      * Set packNo 资产包编号.
      */
     public void setPackNo(String packNo){
@@ -157,6 +141,22 @@ public class AstPackDO{
     }
 
     /**
+     * Set astType 准入资产代码.
+     */
+    public void setAstType(String astType){
+        this.astType = astType;
+    }
+
+    /**
+     * Get astType 准入资产代码.
+     *
+     * @return the string
+     */
+    public String getAstType(){
+        return astType;
+    }
+
+    /**
      * Set packName 资产包名称.
      */
     public void setPackName(String packName){
@@ -173,35 +173,35 @@ public class AstPackDO{
     }
 
     /**
-     * Set astPoolNo 资产池编号.
+     * Set packType 资产包类型: 1. 正常 NORMAL 2.默认(虚拟) DEFAULT.
      */
-    public void setAstPoolNo(String astPoolNo){
-        this.astPoolNo = astPoolNo;
+    public void setPackType(String packType){
+        this.packType = packType;
     }
 
     /**
-     * Get astPoolNo 资产池编号.
+     * Get packType 资产包类型: 1. 正常 NORMAL 2.默认(虚拟) DEFAULT.
      *
      * @return the string
      */
-    public String getAstPoolNo(){
-        return astPoolNo;
+    public String getPackType(){
+        return packType;
     }
 
     /**
-     * Set astTypeCode 准入资产代码.
+     * Set astPoolNo 资产池编号.
      */
-    public void setAstTypeCode(String astTypeCode){
-        this.astTypeCode = astTypeCode;
+    public void setAstPoolNo(String astPoolNo){
+        this.astPoolNo = astPoolNo;
     }
 
     /**
-     * Get astTypeCode 准入资产代码.
+     * Get astPoolNo 资产池编号.
      *
      * @return the string
      */
-    public String getAstTypeCode(){
-        return astTypeCode;
+    public String getAstPoolNo(){
+        return astPoolNo;
     }
 
     /**

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

@@ -5,13 +5,13 @@
     <resultMap id="BaseResultMap"  type="com.abssqr.plat.common.dal.mysql.auto.dataobject.AstPackDO">
         <id column="ID" property="id" jdbcType="DECIMAL" javaType="Long"/>
         <result column="AVAL_AMT" property="avalAmt" jdbcType="DECIMAL" javaType="Long"/>
-        <result column="TYPE" property="type" jdbcType="VARCHAR" javaType="String"/>
         <result column="PACK_NO" property="packNo" jdbcType="VARCHAR" javaType="String"/>
         <result column="PLAN_NO" property="planNo" jdbcType="VARCHAR" javaType="String"/>
         <result column="STATUS" property="status" jdbcType="VARCHAR" javaType="String"/>
+        <result column="AST_TYPE" property="astType" jdbcType="VARCHAR" javaType="String"/>
         <result column="PACK_NAME" property="packName" jdbcType="VARCHAR" javaType="String"/>
+        <result column="PACK_TYPE" property="packType" jdbcType="VARCHAR" javaType="String"/>
         <result column="AST_POOL_NO" property="astPoolNo" jdbcType="VARCHAR" javaType="String"/>
-        <result column="AST_TYPE_CODE" property="astTypeCode" jdbcType="VARCHAR" javaType="String"/>
         <result column="PACK_DATE" property="packDate" jdbcType="DATE" javaType="java.util.Date"/>
         <result column="GMT_CREATE" property="gmtCreate" jdbcType="DATE" javaType="java.util.Date"/>
         <result column="GMT_MODIFIED" property="gmtModified" jdbcType="DATE" javaType="java.util.Date"/>
@@ -26,14 +26,14 @@
     </resultMap>
 
     <sql id="Base_SF_Column_List">
-        sf.ID,sf.AVAL_AMT,sf.TYPE,sf.PACK_NO,sf.PLAN_NO 
+        sf.ID,sf.AVAL_AMT,sf.PACK_TYPE,sf.PACK_NO,sf.PLAN_NO 
         ,sf.STATUS,sf.PACK_NAME,sf.AST_POOL_NO,sf.PACK_DATE,sf.GMT_CREATE 
-        ,sf.GMT_MODIFIED,sf.PACK_SUBMIT_DATE,sf.AST_TYPE_CODE
+        ,sf.GMT_MODIFIED,sf.PACK_SUBMIT_DATE,sf.AST_TYPE
     </sql>
     <sql id="Base_Column_List">
-        ID,AVAL_AMT,TYPE,PACK_NO,PLAN_NO 
+        ID,AVAL_AMT,PACK_TYPE,PACK_NO,PLAN_NO 
         ,STATUS,PACK_NAME,AST_POOL_NO,PACK_DATE,GMT_CREATE 
-        ,GMT_MODIFIED,PACK_SUBMIT_DATE,AST_TYPE_CODE
+        ,GMT_MODIFIED,PACK_SUBMIT_DATE,AST_TYPE
     </sql>
 
 
@@ -43,7 +43,7 @@
             INSERT INTO abs_ast_pack(
                     ID
                     ,AVAL_AMT
-                    ,TYPE
+                    ,PACK_TYPE
                     ,PACK_NO
                     ,PLAN_NO
                     ,STATUS
@@ -53,11 +53,11 @@
                     ,GMT_CREATE
                     ,GMT_MODIFIED
                     ,PACK_SUBMIT_DATE
-                    ,AST_TYPE_CODE
+                    ,AST_TYPE
             )VALUES(
                       SEQ_ABS_AST_PACK.nextval 
                     ,  #{avalAmt,jdbcType=DECIMAL}
-                    ,  #{type,jdbcType=VARCHAR}
+                    ,  #{packType,jdbcType=VARCHAR}
                     ,  #{packNo,jdbcType=VARCHAR}
                     ,  #{planNo,jdbcType=VARCHAR}
                     ,  #{status,jdbcType=VARCHAR}
@@ -67,7 +67,7 @@
                     ,  sysdate
                     ,  sysdate
                     ,  #{packSubmitDate,jdbcType=DATE}
-                    ,  #{astTypeCode,jdbcType=VARCHAR}
+                    ,  #{astType,jdbcType=VARCHAR}
             )
             ]]>
     </insert>
@@ -79,7 +79,7 @@
             INSERT INTO abs_ast_pack(
                 ID
                 ,AVAL_AMT
-                ,TYPE
+                ,PACK_TYPE
                 ,PACK_NO
                 ,PLAN_NO
                 ,STATUS
@@ -89,12 +89,12 @@
                 ,GMT_CREATE
                 ,GMT_MODIFIED
                 ,PACK_SUBMIT_DATE
-                ,AST_TYPE_CODE
+                ,AST_TYPE
             )VALUES
             (
              null
             , #{item.avalAmt,jdbcType=DECIMAL}
-            , #{item.type,jdbcType=VARCHAR}
+            , #{item.packType,jdbcType=VARCHAR}
             , #{item.packNo,jdbcType=VARCHAR}
             , #{item.planNo,jdbcType=VARCHAR}
             , #{item.status,jdbcType=VARCHAR}
@@ -104,7 +104,7 @@
             , sysdate
             , sysdate
             , #{item.packSubmitDate,jdbcType=DATE}
-            , #{item.astTypeCode,jdbcType=VARCHAR}
+            , #{item.astType,jdbcType=VARCHAR}
             )
     </foreach>
         ;end;
@@ -135,7 +135,7 @@
         UPDATE /*MS-ABS-AST-PACK-UPDATEBYABSPACKPACKNO*/ abs_ast_pack
         SET
             AVAL_AMT        = #{avalAmt,jdbcType=DECIMAL}
-            ,TYPE            = #{type,jdbcType=VARCHAR}
+            ,PACK_TYPE       = #{packType,jdbcType=VARCHAR}
             ,PLAN_NO         = #{planNo,jdbcType=VARCHAR}
             ,STATUS          = #{status,jdbcType=VARCHAR}
             ,PACK_NAME       = #{packName,jdbcType=VARCHAR}
@@ -143,7 +143,7 @@
             ,PACK_DATE       = #{packDate,jdbcType=DATE}
             ,GMT_MODIFIED    = sysdate
             ,PACK_SUBMIT_DATE = #{packSubmitDate,jdbcType=DATE}
-            ,AST_TYPE_CODE   = #{astTypeCode,jdbcType=VARCHAR}
+            ,AST_TYPE   = #{astType,jdbcType=VARCHAR}
         WHERE
             PACK_NO         = #{packNo,jdbcType=VARCHAR}
         ]]>
@@ -194,7 +194,9 @@
           COUNT(*) AS total 
         FROM
           ABS_AST_PACK
-        <where>
+        WHERE
+          PACK_TYPE != 'default'
+          AND status not in('publish')
             <if test="packNo != null and packNo != ''">
                 AND PACK_NO like  '%'||#{packNo,jdbcType=VARCHAR}||'%'
             </if>
@@ -207,7 +209,6 @@
                     #{item,jdbcType=VARCHAR}
                 </foreach>
             </if>
-        </where>
         
     </select>
     <!--分页获取资产包 pageResult  mydalgen自动生成，请勿修改-->
@@ -222,7 +223,9 @@
           <include refid="Base_Column_List" />
         FROM
           ABS_AST_PACK
-        <where>
+        WHERE
+          PACK_TYPE != 'default'
+          AND status not in('publish')
             <if test="packNo != null and packNo != ''">
                 AND PACK_NO like  '%'||#{packNo,jdbcType=VARCHAR}||'%'
             </if>
@@ -235,7 +238,6 @@
                     #{item,jdbcType=VARCHAR}
                 </foreach>
             </if>
-        </where>
          ORDER BY ID DESC
         ) tt where ROWNUM &lt;= #{endRow}
     ) table_alias

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

@@ -6,7 +6,7 @@
         <id column="ID" property="id" jdbcType="DECIMAL" javaType="Long"/>
         <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="AST_TYPE_CODE" property="astType" 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>
@@ -37,7 +37,7 @@
                     ,  #{astPoolNo,jdbcType=VARCHAR}
                     ,  sysdate
                     ,  #{astPoolName,jdbcType=VARCHAR}
-                    ,  #{astTypeCode,jdbcType=VARCHAR}
+                    ,  #{astType,jdbcType=VARCHAR}
                     ,  sysdate
             )
             ]]>
@@ -60,7 +60,7 @@
             , #{item.astPoolNo,jdbcType=VARCHAR}
             , sysdate
             , #{item.astPoolName,jdbcType=VARCHAR}
-            , #{item.astTypeCode,jdbcType=VARCHAR}
+            , #{item.astType,jdbcType=VARCHAR}
             , sysdate
             )
     </foreach>

app/common/facade/src/main/java/com/abssqr/plat/common/facade/enums/AstPackTypeEnum.java

@@ -17,7 +17,7 @@ import java.util.Map;
  */
 public enum AstPackTypeEnum implements IEnum {
     NORMAL("normal","正常"),
-    DEFAULT("default","默认宝"),
+    DEFAULT("default","默认包"),
 
     ;
 

app/common/facade/src/main/java/com/abssqr/plat/common/facade/param/ast/AstPackOprParam.java

@@ -55,7 +55,7 @@ public class AstPackOprParam extends BaseOprParam {
      * 资产类型
      */
     @VldEnums(enumClass = AstTypeEnum.class, message = "不支持的资产类型")
-    private String astTypeCode;
+    private String astType;
 
     public String getPackNo() {
         return packNo;
@@ -100,12 +100,12 @@ public class AstPackOprParam extends BaseOprParam {
         this.astPoolNo = astPoolNo;
     }
 
-    public String getAstTypeCode() {
-        return astTypeCode;
+    public String getAstType() {
+        return astType;
     }
 
-    public void setAstTypeCode(String astTypeCode) {
-        this.astTypeCode = astTypeCode;
+    public void setAstType(String astType) {
+        this.astType = astType;
     }
 
     @Override

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

@@ -5,18 +5,13 @@
 
 package com.abssqr.plat.common.model.convertor;
 
-import com.abssqr.plat.common.dal.mysql.auto.dao.AstPackDAO;
 import com.abssqr.plat.common.dal.mysql.auto.dataobject.AstPackDO;
-import com.abssqr.plat.common.dal.mysql.auto.dataobject.AstPoolDO;
 import com.abssqr.plat.common.facade.enums.AstPackStatusEnum;
 import com.abssqr.plat.common.facade.enums.AstPackTypeEnum;
 import com.abssqr.plat.common.facade.enums.AstTypeEnum;
-import com.abssqr.plat.common.facade.param.ast.AstPackOprParam;
 import com.abssqr.plat.common.model.domain.ast.AstPack;
-import com.abssqr.plat.common.model.domain.ast.AstPoolEntity;
 import com.general.system.common.model.Money;
 
-import java.nio.file.OpenOption;
 import java.util.Optional;
 
 /**
@@ -34,7 +29,7 @@ public class AstPackConvert {
         //avalAmt 规模
         result.setAvalAmt(Money.createWithCent(param.getAvalAmt()));
         //type 资产包类型: 1. 正常 NORMAL 2.默认(虚拟) DEFAULT
-        result.setType(AstPackTypeEnum.getByCode(param.getType()));
+        result.setPackType(AstPackTypeEnum.getByCode(param.getPackType()));
         //packNo 资产包编号
         result.setPackNo(param.getPackNo());
         //planNo 产品编号
@@ -61,7 +56,7 @@ public class AstPackConvert {
         //avalAmt 规模
         result.setAvalAmt(Optional.ofNullable(param.getAvalAmt()).map(Money::getCent).orElse(null));
         //type 资产包类型: 1. 正常 NORMAL 2.默认(虚拟) DEFAULT
-        result.setType(Optional.ofNullable(param.getType()).map(AstPackTypeEnum::getCode).orElse(null));
+        result.setPackType(Optional.ofNullable(param.getPackType()).map(AstPackTypeEnum::getCode).orElse(null));
         //packNo 资产包编号
         result.setPackNo(param.getPackNo());
         //planNo 产品编号
@@ -77,7 +72,7 @@ public class AstPackConvert {
         //packSubmitDate 封包提交日
         result.setPackSubmitDate(param.getPackSubmitDate());
 
-        result.setAstTypeCode(Optional.ofNullable(param.getAstTypeCode()).map(AstTypeEnum::getCode).orElse(null));
+        result.setAstType(Optional.ofNullable(param.getAstType()).map(AstTypeEnum::getCode).orElse(null));
         return result;
     }
 }
\ No newline at end of file

app/common/model/src/main/java/com/abssqr/plat/common/model/domain/ast/AstPack.java

@@ -28,7 +28,7 @@ public class AstPack {
     /**
      * type 资产包类型: 1. 正常 NORMAL 2.默认(虚拟) DEFAULT.
      */
-    private AstPackTypeEnum     type;
+    private AstPackTypeEnum     packType;
     /**
      * packNo 资产包编号.
      */
@@ -65,7 +65,7 @@ public class AstPack {
     /**
      * 资产类型
      */
-    private AstTypeEnum astTypeCode;
+    private AstTypeEnum astType;
 
     public Money getAvalAmt() {
         return avalAmt;
@@ -75,12 +75,12 @@ public class AstPack {
         this.avalAmt = avalAmt;
     }
 
-    public AstPackTypeEnum getType() {
-        return type;
+    public AstPackTypeEnum getPackType() {
+        return packType;
     }
 
-    public void setType(AstPackTypeEnum type) {
-        this.type = type;
+    public void setPackType(AstPackTypeEnum packType) {
+        this.packType = packType;
     }
 
     public String getPackNo() {
@@ -147,11 +147,11 @@ public class AstPack {
         this.screenRuleList = screenRuleList;
     }
 
-    public AstTypeEnum getAstTypeCode() {
-        return astTypeCode;
+    public AstTypeEnum getAstType() {
+        return astType;
     }
 
-    public void setAstTypeCode(AstTypeEnum astTypeCode) {
-        this.astTypeCode = astTypeCode;
+    public void setAstType(AstTypeEnum astType) {
+        this.astType = astType;
     }
 }

app/core/service/src/main/java/com/abssqr/plat/core/service/ast/AstPackManager.java

@@ -13,7 +13,6 @@ import com.abssqr.plat.common.model.domain.task.CommonTask;
 import com.abssqr.plat.common.model.repo.ast.AstPackRepo;
 import com.abssqr.plat.common.model.repo.rule.AstScreenRuleRepo;
 import com.abssqr.plat.common.model.repo.task.CommonTaskRepository;
-import com.abssqr.plat.common.model.seq.SequenceUtil;
 import com.abssqr.plat.common.util.base.autoconfig.AbsConfig;
 import com.general.system.common.util.VarChecker;
 import org.apache.commons.collections.CollectionUtils;
@@ -70,9 +69,9 @@ public class AstPackManager {
         result.setPackName(param.getPackName());
         result.setAvalAmt(param.getAvalAmtMoney());
         result.setAstPoolNo(param.getAstPoolNo());
-        result.setType(AstPackTypeEnum.NORMAL);
+        result.setPackType(AstPackTypeEnum.NORMAL);
         result.setStatus(AstPackStatusEnum.INIT);
-        result.setAstTypeCode(AstTypeEnum.getByCode(param.getAstTypeCode()));
+        result.setAstType(AstTypeEnum.getByCode(param.getAstType()));
         if (CollectionUtils.isNotEmpty(param.getScreenRuleList())) {
             param.getScreenRuleList().forEach(item -> {
                 if (StringUtils.isNotEmpty(item.getLeftValue()) || StringUtils.isNotEmpty(item.getRightValue())) {

app/test/src/test/resources/testdata/unittest/pack/add/pack_add_case0001.yaml

@@ -49,8 +49,8 @@ checkDBContext:
       STATUS: init
       PACK_DATE:
       PACK_SUBMIT_DATE:
-      TYPE: normal
-      AST_TYPE_CODE: QCDK
+      PACK_TYPE: normal
+      AST_TYPE: QCDK
 
 ###
 --- !!com.abssqr.plat.common.facade.param.ast.AstPackOprParam
@@ -58,7 +58,7 @@ packNo: packAdd01
 packName: 资产包01
 avalAmt: 10000000
 astPoolNo: astPool01
-astTypeCode: QCDK
+astType: QCDK
 screenRuleList:
   - ruleType: QCDK_RISK_TYPE
     leftValue:

app/test/src/test/resources/testdata/unittest/pack/list/pack_list_case0001.yaml

@@ -23,8 +23,8 @@ initDBContext:
     STATUS: 'init'
     PACK_DATE:
     PACK_SUBMIT_DATE:
-    TYPE: normal
-    AST_TYPE_CODE: QCDK
+    PACK_TYPE: normal
+    AST_TYPE: QCDK
     GMT_CREATE: sysdate
     GMT_MODIFIED: sysdate
 

doc/一期/ABS_AST_PACK.sql

-drop table ABS_AST_PACK;
+drop table ABS_AST_PACK;
@@ -10,8 +10,8 @@ CREATE TABLE ABS_AST_PACK (
   STATUS VARCHAR2(16) ,
   PACK_DATE DATE ,
   PACK_SUBMIT_DATE DATE ,
-  TYPE VARCHAR2(16) ,
-  AST_TYPE_CODE VARCHAR2(64),
+  PACK_TYPE VARCHAR2(16) ,
+  AST_TYPE VARCHAR2(64),
   GMT_CREATE DATE ,
   GMT_MODIFIED DATE ,
   PRIMARY KEY (ID)
@@ -41,9 +41,9 @@ COMMENT ON COLUMN ABS_AST_PACK.PACK_DATE IS '封包日';
 
 COMMENT ON COLUMN ABS_AST_PACK.PACK_SUBMIT_DATE IS '封包提交日';
 
-COMMENT ON COLUMN ABS_AST_PACK.TYPE IS '资产包类型: 1. 正常 normal 2.默认(虚拟) default';
+COMMENT ON COLUMN ABS_AST_PACK.PACK_TYPE IS '资产包类型: 1. 正常 normal 2.默认(虚拟) default';
 
-COMMENT ON COLUMN ABS_AST_PACK.AST_TYPE_CODE IS '准入资产代码';
+COMMENT ON COLUMN ABS_AST_PACK.AST_TYPE IS '准入资产代码';
 
 COMMENT ON COLUMN ABS_AST_PACK.GMT_CREATE IS '创建时间';