资产列表查询

app/biz/service/src/main/java/com/abssqr/plat/biz/api/ast/AstPoolServiceImpl.java

 package com.abssqr.plat.biz.api.ast;
 
 import com.abssqr.plat.biz.support.ServiceSupport;
-import com.abssqr.plat.common.dal.mysql.auto.paging.AstPoolLoanPage;
 import com.abssqr.plat.common.dal.mysql.auto.paging.AstPoolPage;
 import com.abssqr.plat.common.dal.mysql.auto.resultmap.AstPoolLoanStat;
 import com.abssqr.plat.common.facade.base.BaseStringParam;
 import com.abssqr.plat.common.facade.enums.AstTypeEnum;
-import com.abssqr.plat.common.facade.param.ast.AstPageQryParam;
 import com.abssqr.plat.common.facade.param.astPool.AstPoolOprParam;
 import com.abssqr.plat.common.facade.param.astPool.AstPoolPageQryParam;
 import com.abssqr.plat.common.facade.result.BasePage;
-import com.abssqr.plat.common.facade.result.ast.AstPoolLoanVO;
 import com.abssqr.plat.common.facade.result.astPool.AstPoolVO;
 import com.abssqr.plat.common.facade.service.ast.AstPoolService;
 import com.abssqr.plat.common.facade.validation.Valid;
-import com.abssqr.plat.common.model.convertor.web.AstPoolLoanWebConvert;
 import com.abssqr.plat.common.model.convertor.web.AstPoolWebConvert;
 import com.abssqr.plat.common.model.domain.ast.AstPoolEntity;
 import com.abssqr.plat.common.model.enums.IdTypeEnum;
@@ -106,13 +102,5 @@ public class AstPoolServiceImpl extends ServiceSupport implements AstPoolService
         });
     }
 
-    @Override
-    public BasePage<AstPoolLoanVO> astList(AstPageQryParam astPageQryParam) {
-        return super.doQry(astPageQryParam,()->{
-            AstPoolLoanPage result = astPoolRepository.astPage(AstPoolLoanWebConvert.convertAstParam2AstPage(astPageQryParam));
-            return  AstPoolLoanWebConvert.convertAstPoolLoan2AstPoolVOs(result);
-        });
-    }
-
 
 }

app/biz/service/src/main/java/com/abssqr/plat/biz/api/ast/AstServiceImpl.java

 package com.abssqr.plat.biz.api.ast;
 
-import com.abssqr.plat.biz.support.ServiceSupport;
+import java.io.UnsupportedEncodingException;
+import java.util.List;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
 
+import com.abssqr.plat.biz.support.ServiceSupport;
+import com.abssqr.plat.common.dal.mysql.auto.paging.AstPackAddLoanPage;
+import com.abssqr.plat.common.dal.mysql.auto.paging.AstPackLoanPage;
+import com.abssqr.plat.common.dal.mysql.auto.paging.AstPoolLoanPage;
 import com.abssqr.plat.common.dal.mysql.auto.paging.PackAstPage;
 import com.abssqr.plat.common.facade.param.ast.AstDownLoadParam;
+import com.abssqr.plat.common.facade.param.ast.AstPageQryParam;
+import com.abssqr.plat.common.facade.result.BasePage;
+import com.abssqr.plat.common.facade.result.ast.AstLoanVO;
 import com.abssqr.plat.common.facade.service.ast.AstService;
 import com.abssqr.plat.common.facade.validation.Valid;
+import com.abssqr.plat.common.model.convertor.web.AstLoanWebConvert;
+import com.abssqr.plat.common.model.domain.ast.AstPack;
 import com.abssqr.plat.common.model.exception.AbssqrBizException;
 import com.abssqr.plat.common.model.repo.ast.LoanRepository;
+import com.abssqr.plat.core.service.ast.AstPackManager;
 import com.abssqr.plat.core.service.ast.DownLoadAstManager;
+
+import com.general.system.common.util.VarChecker;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
-import java.io.UnsupportedEncodingException;
-import java.util.*;
-
 @Component
 public class AstServiceImpl extends ServiceSupport implements AstService {
     protected final Logger LOGGER = LoggerFactory.getLogger(getClass());
@@ -26,8 +37,9 @@ public class AstServiceImpl extends ServiceSupport implements AstService {
     private final int limit=2000;
 
     @Autowired
-    LoanRepository loanRepository;
-
+    LoanRepository     loanRepository;
+    @Autowired
+    AstPackManager     astPackManager;
     @Autowired
     DownLoadAstManager downLoadAstManager;
 
@@ -48,6 +60,49 @@ public class AstServiceImpl extends ServiceSupport implements AstService {
 
     }
 
+    /**
+     * 查询资产列表
+     *
+     * @param astPageQryParam
+     * @return
+     */
+    @Override
+    public BasePage<AstLoanVO> poolAstList(AstPageQryParam astPageQryParam) {
+        return super.doQry(astPageQryParam, () -> {
+            AstPoolLoanPage astPoolLoanPage = new AstPoolLoanPage();
+            astPoolLoanPage.setAstPoolNo(astPageQryParam.getAstPoolNo());
+            astPoolLoanPage.setCurrPageNo(astPageQryParam.getPageNum());
+            astPoolLoanPage.setLimit(astPageQryParam.getPageNum());
+            astPoolLoanPage = loanRepository.getLoanPageByAstPoolNo(astPoolLoanPage);
+            return AstLoanWebConvert.convert2AstPoolVOs(astPoolLoanPage);
+        });
+    }
+
+    @Override
+    public BasePage<AstLoanVO> packAstList(AstPageQryParam astPageQryParam) {
+        VarChecker.checkNotEmpty(astPageQryParam.getPackNo(), "资产包编号不能为空");
+        return super.doQry(astPageQryParam, () -> {
+            AstPack astPack = astPackManager.get(astPageQryParam.getPackNo());
+            AstPackLoanPage astPackLoanPage = new AstPackLoanPage();
+            astPackLoanPage.setPackNo(astPack.getPackNo());
+            astPackLoanPage = loanRepository.getLoanListForPack(astPackLoanPage);
+            return AstLoanWebConvert.convert2AstPoolVOs(astPackLoanPage);
+        });
+    }
+
+    @Override
+    public BasePage<AstLoanVO> packAddAstList(AstPageQryParam astPageQryParam) {
+        VarChecker.checkNotEmpty(astPageQryParam.getPackNo(), "资产包编号不能为空");
+        return super.doQry(astPageQryParam, () -> {
+            AstPack astPack = astPackManager.get(astPageQryParam.getPackNo());
+            AstPackAddLoanPage astPackLoanPage = new AstPackAddLoanPage();
+            astPackLoanPage.setAstPoolNo(astPack.getAstPoolNo());
+            astPackLoanPage.setAstType(astPack.getAstType());
+            astPackLoanPage.setScreenRuleList(astPack.getScreenRuleList());
+            astPackLoanPage = loanRepository.getLoanPageForPackAddAst(astPackLoanPage);
+            return AstLoanWebConvert.convert2AstPoolVOs(astPackLoanPage);
+        });
+    }
 
     private ServletOutputStream getOutputStream(String packNo,HttpServletResponse response) throws Exception{
         response.reset();
@@ -66,6 +121,4 @@ public class AstServiceImpl extends ServiceSupport implements AstService {
     }
 
 
-
-
 }

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

@@ -300,7 +300,7 @@
     </resultmap>
 
 
-    <resultmap name="AstPoolLoan" type="AstPoolLoan">
+    <resultmap name="AstLoanResultMap" type="AstLoan">
         <column name="AST_NO" jdbctype="VARCHAR" javatype="String" remark="资产编号"/>
         <column name="PRIN_BAL" jdbctype="BIGINT" javatype="com.general.system.common.model.Money" remark="贷款剩余本金"/>
         <column name="START_DATE" jdbctype="DATE" javatype="java.util.Date" remark="贷款日期"/>
@@ -314,8 +314,6 @@
     </resultmap>
 
 
-    AstPoolLoan
-
     <operation name="statPlanBal" resultmap="LoanPropCntStat" multiplicity="one" remark="统计机构当前资产规模">
         SELECT
             LENDER_ORG_CODE as PROP_VAL,
@@ -395,46 +393,44 @@
             R2.AST_POOL_NO=#{astPoolNo,jdbcType=VARCHAR}
     </operation>
 
-
-    <operation name="getLoanListByAstPoolNo" resultmap="AstPoolLoan" multiplicity="paging" paging="AstPoolLoan" remark="根据资产池编号查询对应的资产">
+    <sql id="pageResltSql">
+        L1.AST_NO, --资产编号
+        L1.PRIN_BAL, --贷款剩余本金
+        L1.START_DATE, --贷款日期
+        L1.TERM_CNT-L1.CUR_TERM AS FREE_TERM, --贷款剩余期限
+        R1.RATE, --贷款利率
+        L1.RISK_CL, --五级分类
+        R1.REPAY_PERIOD, --还款周期
+        R1.REPAY_PERIOD_TYPE, --还款周期类型
+        R1.REPAY_METHOD, --还款方式
+        R4.PLAN_NAME  --资产归属
+    </sql>
+    <operation name="getLoanListByAstPoolNo" resultmap="AstLoanResultMap" multiplicity="paging" paging="AstPoolLoan" remark="根据资产池编号查询对应的资产">
         SELECT
-            L1.AST_NO, --资产编号
-            L1.PRIN_BAL, --贷款剩余本金
-            L1.START_DATE, --贷款日期
-            L1.TERM_CNT-L1.CUR_TERM AS FREE_TERM, --贷款剩余期限
-            R1.RATE, --贷款利率
-            L1.RISK_CL, --五级分类
-            R1.REPAY_PERIOD, --还款周期
-            R1.REPAY_PERIOD_TYPE, --还款周期类型
-            R1.REPAY_METHOD, --还款方式
-            R4.PLAN_NAME  --资产归属
+            <include refid="pageResltSql"/>
         FROM
             ABS_LOAN L1
-        LEFT JOIN ABS_LOAN_CONTRACT R1 ON L1.AST_NO=R1.AST_NO
-        LEFT JOIN ABS_LOAN_PACK_REL R2 ON L1.AST_NO=R2.AST_NO
-        LEFT JOIN ABS_AST_PACK R3 ON R2.PACK_NO=R3.PACK_NO
-        LEFT JOIN ABS_PLAN R4 ON R3.PLAN_NO=R4.PLAN_NO
+        LEFT JOIN ABS_LOAN_CONTRACT R1
+            ON L1.AST_NO=R1.AST_NO
+        LEFT JOIN ABS_LOAN_PACK_REL R2
+            ON L1.AST_NO=R2.AST_NO
+        LEFT JOIN ABS_AST_PACK R3
+            ON R2.PACK_NO=R3.PACK_NO
+        LEFT JOIN ABS_PLAN R4
+            ON R3.PLAN_NO=R4.PLAN_NO
         WHERE
             R2.STATUS='in'
         AND R3.AST_POOL_NO=#{astPoolNo,jdbcType=VARCHAR}
+        AND L1.STATUS IN ('nor', 'ovd')
     </operation>
 
-    <operation name="getLoanListForPackAddAst" resultmap="AstPoolLoan" multiplicity="paging" paging="AstPackLoan" remark="根据资产池编号查询对应的资产">
+    <operation name="getLoanListForPackAddAst" resultmap="AstLoanResultMap" multiplicity="paging" paging="AstPackAddLoan" remark="根据资产池编号查询对应的资产">
         <extraparams>
             <param name="screenRuleList" javatype="java.util.List&lt;com.abssqr.plat.common.facade.model.rule.AstScreenRule&gt;"/>
             <param name="astType" javatype="com.abssqr.plat.common.facade.enums.AstTypeEnum"/>
         </extraparams>
         SELECT
-            L1.AST_NO, --资产编号
-            L1.PRIN_BAL, --贷款剩余本金
-            L1.START_DATE, --贷款日期
-            L1.TERM_CNT-L1.CUR_TERM AS FREE_TERM, --贷款剩余期限
-            R1.RATE, --贷款利率
-            L1.RISK_CL, --五级分类
-            R1.REPAY_PERIOD, --还款周期
-            R1.REPAY_PERIOD_TYPE, --还款周期类型
-            R1.REPAY_METHOD, --还款方式
-            R4.PLAN_NAME  --资产归属
+            <include refid="pageResltSql"/>
         FROM
             ABS_LOAN L1
             UNION (
@@ -442,13 +438,36 @@
                     <include refid="ABS_LOAN_PACK_REL.QCDK_SQL"/>
                 </if>
             ) u ON L1.ast_no=u.ast_no
-            LEFT JOIN ABS_LOAN_CONTRACT R1 ON L1.AST_NO=R1.AST_NO
-            LEFT JOIN ABS_LOAN_PACK_REL R2 ON L1.AST_NO=R2.AST_NO
-            LEFT JOIN ABS_AST_PACK R3 ON R2.PACK_NO=R3.PACK_NO
-            LEFT JOIN ABS_PLAN R4 ON R3.PLAN_NO=R4.PLAN_NO
+            LEFT JOIN ABS_LOAN_CONTRACT R1
+                ON L1.AST_NO=R1.AST_NO
+            LEFT JOIN ABS_LOAN_PACK_REL R2
+                ON L1.AST_NO=R2.AST_NO
+            LEFT JOIN ABS_AST_PACK R3
+                ON R2.PACK_NO=R3.PACK_NO
+            LEFT JOIN ABS_PLAN R4
+                ON R3.PLAN_NO=R4.PLAN_NO
         WHERE
             R2.STATUS='in'
             AND R3.AST_POOL_NO=#{astPoolNo,jdbcType=VARCHAR}
+            AND L1.STATUS IN ('nor', 'ovd')
+    </operation>
+    <operation name="getLoanListForPack" resultmap="AstLoanResultMap" multiplicity="paging" paging="AstPackLoan" remark="根据资产池编号查询对应的资产">
+        SELECT
+            <include refid="pageResltSql"/>
+        FROM
+            ABS_LOAN L1
+            LEFT JOIN ABS_LOAN_CONTRACT R1
+                ON L1.AST_NO=R1.AST_NO
+            LEFT JOIN ABS_LOAN_PACK_REL R2
+                ON L1.AST_NO=R2.AST_NO
+            LEFT JOIN ABS_AST_PACK R3
+                ON R2.PACK_NO=R3.PACK_NO
+            LEFT JOIN ABS_PLAN R4
+                ON R3.PLAN_NO=R4.PLAN_NO
+        WHERE
+            R2.STATUS='in'
+        AND R2.PACK_NO         = #{packNo,jdbcType=VARCHAR}
+        AND L1.STATUS IN ('nor', 'ovd')
     </operation>
 
     <operation name="getLoanPageByPackNo" multiplicity="paging" paging="PackAst" remark="根据资产包编号分页获取所有的资产">

app/common/dal/src/getsetter/Do/PlanDO.txt

@@ -4,24 +4,24 @@
     result.setId(param.getId());
     //totalAmt 发行规模
     result.setTotalAmt(param.getTotalAmt());
-    //allocPeriod 兑付周期
-    result.setAllocPeriod(param.getAllocPeriod());
     //planNo 产品编号
     result.setPlanNo(param.getPlanNo());
     //status 产品状态（设计中，已发行，已清算）
     result.setStatus(param.getStatus());
+    //payFreq 
+    result.setPayFreq(param.getPayFreq());
     //planName 产品简称
     result.setPlanName(param.getPlanName());
     //gmtCreator 计划创建人
     result.setGmtCreator(param.getGmtCreator());
     //tradePlace 交易场所
     result.setTradePlace(param.getTradePlace());
+    //gmtModifier 最近更新人
+    result.setGmtModifier(param.getGmtModifier());
     //calcIntrType 计息方式/计息基准
     result.setCalcIntrType(param.getCalcIntrType());
     //planFullName 产品全称
     result.setPlanFullName(param.getPlanFullName());
-    //allocPeriodMethod 兑付周期类型
-    result.setAllocPeriodMethod(param.getAllocPeriodMethod());
     //endDate 法定到期日
     result.setEndDate(param.getEndDate());
     //beginDate 产品成立日
@@ -44,15 +44,15 @@
 
     //id 
     //totalAmt 发行规模
-    //allocPeriod 兑付周期
     //planNo 产品编号
     //status 产品状态（设计中，已发行，已清算）
+    //payFreq 
     //planName 产品简称
     //gmtCreator 计划创建人
     //tradePlace 交易场所
+    //gmtModifier 最近更新人
     //calcIntrType 计息方式/计息基准
     //planFullName 产品全称
-    //allocPeriodMethod 兑付周期类型
     //endDate 法定到期日
     //beginDate 产品成立日
     //gmtCreate 创建时间

app/common/dal/src/main/java/com/abssqr/plat/common/dal/AbssqrCoreConstants.java

@@ -121,6 +121,7 @@ public class AbssqrCoreConstants{
     }
     public static class ABS_LOAN{
         public static final String tableName="ABS_LOAN";
+        public static final String  pageResltSql = "L1.AST_NO, --资产编号         L1.PRIN_BAL, --贷款剩余本金         L1.START_DATE, --贷款日期         L1.TERM_CNT-L1.CUR_TERM AS FREE_TERM, --贷款剩余期限         R1.RATE, --贷款利率         L1.RISK_CL, --五级分类         R1.REPAY_PERIOD, --还款周期         R1.REPAY_PERIOD_TYPE, --还款周期类型         R1.REPAY_METHOD, --还款方式         R4.PLAN_NAME  --资产归属";
         public static final String  Base_SF_Column_List = "sf.USER_ID,sf.FEE_BAL,sf.INTR_BAL,sf.PRIN_BAL,sf.PAID_FEE_AMT,sf.OVD_PRIN_BAL,sf.OVD_INTR_BAL,sf.OVD_FEE_BAL,sf.OWN_STATUS         ,sf.FEE_PENAL_BAL,sf.OTHER_FEE_BAL,sf.PAID_INTR_AMT,sf.PAID_PRIN_AMT,sf.INTR_PENAL_BAL         ,sf.PRIN_PENAL_BAL,sf.PAID_FEE_PENAL_AMT,sf.PAID_OTHER_FEE_AMT,sf.OTHER_FEE_PENAL_BAL,sf.PAID_INTR_PENAL_AMT         ,sf.PAID_PRIN_PENAL_AMT,sf.PAID_OTHER_FEE_PENAL_AMT,sf.AST_NO,sf.OWN_ORG,sf.PROD_NO,sf.OUT_PROD_NO         ,sf.RISK_CL,sf.STATUS,sf.OWN_PACK,sf.OUT_AST_NO,sf.CONTRACT_NO         ,sf.LAST_OWN_ORG,sf.LENDER_ORG_CODE,sf.MANAGER_ORG_CODE,sf.SPONSER_ORG_CODE,sf.CUR_TERM,sf.WTF_STATUS         ,sf.OVD_DAYS,sf.TERM_CNT,sf.IN_DATE,sf.END_DATE,sf.CLEAR_DATE,sf.DISB_DATE         ,sf.GMT_CREATE,sf.START_DATE,sf.GMT_MODIFIED,sf.LAST_UPDATE_DATE,sf.CERT_NO,sf.TRANS_CNT         ,sf.CAPITAL_NO,sf.LAYER_NAME,sf.EXT_INF";
         public static final String  Base_Column_List = "USER_ID,FEE_BAL,INTR_BAL,PRIN_BAL,PAID_FEE_AMT,OVD_PRIN_BAL,OVD_INTR_BAL,OVD_FEE_BAL,OWN_STATUS         ,FEE_PENAL_BAL,OTHER_FEE_BAL,PAID_INTR_AMT,PAID_PRIN_AMT,INTR_PENAL_BAL         ,PRIN_PENAL_BAL,PAID_FEE_PENAL_AMT,PAID_OTHER_FEE_AMT,OTHER_FEE_PENAL_BAL,PAID_INTR_PENAL_AMT         ,PAID_PRIN_PENAL_AMT,PAID_OTHER_FEE_PENAL_AMT,AST_NO,OWN_ORG,PROD_NO,OUT_PROD_NO         ,RISK_CL,STATUS,OWN_PACK,OUT_AST_NO,CONTRACT_NO         ,LAST_OWN_ORG,LENDER_ORG_CODE,MANAGER_ORG_CODE,SPONSER_ORG_CODE,CUR_TERM,WTF_STATUS         ,OVD_DAYS,TERM_CNT,IN_DATE,END_DATE,CLEAR_DATE,DISB_DATE         ,GMT_CREATE,START_DATE,GMT_MODIFIED,LAST_UPDATE_DATE,CERT_NO,TRANS_CNT,CAPITAL_NO,LAYER_NAME,EXT_INF";
     }

app/common/dal/src/main/java/com/abssqr/plat/common/dal/mysql/auto/dao/LoanDAO.java

@@ -10,6 +10,7 @@ import com.abssqr.plat.common.dal.mysql.auto.paging.CapitalAstMatchPage;
 import com.abssqr.plat.common.dal.mysql.auto.paging.CapitalAstUnMatchPage;
 import com.abssqr.plat.common.dal.mysql.auto.resultmap.AstPoolLoanStat;
 import com.abssqr.plat.common.dal.mysql.auto.paging.AstPoolLoanPage;
+import com.abssqr.plat.common.dal.mysql.auto.paging.AstPackAddLoanPage;
 import com.abssqr.plat.common.dal.mysql.auto.paging.AstPackLoanPage;
 import com.abssqr.plat.common.dal.mysql.auto.paging.PackAstPage;
 import com.abssqr.plat.common.dal.mysql.auto.mapper.LoanDOMapper;
@@ -173,14 +174,30 @@ public class LoanDAO{
     }
     /**
      * desc:根据资产池编号查询对应的资产.<br/>
+     * @param astPackAddLoan astPackAddLoan
+     * @return AstPackAddLoanPage
+     */
+    
+    public AstPackAddLoanPage getLoanListForPackAddAst(AstPackAddLoanPage astPackAddLoan){
+        int total = loanDOMapper.getLoanListForPackAddAstCount(astPackAddLoan);
+        if(total>0){
+            astPackAddLoan.setDatas(loanDOMapper.getLoanListForPackAddAstResult(astPackAddLoan));
+        }else{
+            astPackAddLoan.setDatas(new ArrayList());
+        }
+        astPackAddLoan.setTotal(total);
+        return astPackAddLoan;
+    }
+    /**
+     * desc:根据资产池编号查询对应的资产.<br/>
      * @param astPackLoan astPackLoan
      * @return AstPackLoanPage
      */
     
-    public AstPackLoanPage getLoanListForPackAddAst(AstPackLoanPage astPackLoan){
-        int total = loanDOMapper.getLoanListForPackAddAstCount(astPackLoan);
+    public AstPackLoanPage getLoanListForPack(AstPackLoanPage astPackLoan){
+        int total = loanDOMapper.getLoanListForPackCount(astPackLoan);
         if(total>0){
-            astPackLoan.setDatas(loanDOMapper.getLoanListForPackAddAstResult(astPackLoan));
+            astPackLoan.setDatas(loanDOMapper.getLoanListForPackResult(astPackLoan));
         }else{
             astPackLoan.setDatas(new ArrayList());
         }

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

@@ -16,10 +16,6 @@ public class PlanDO{
      */
     private Long totalAmt;
     /**
-     * allocPeriod 兑付周期.
-     */
-    private Long allocPeriod;
-    /**
      * planNo 产品编号.
      */
     private String planNo;
@@ -28,6 +24,10 @@ public class PlanDO{
      */
     private String status;
     /**
+     * payFreq .
+     */
+    private String payFreq;
+    /**
      * planName 产品简称.
      */
     private String planName;
@@ -40,6 +40,10 @@ public class PlanDO{
      */
     private String tradePlace;
     /**
+     * gmtModifier 最近更新人.
+     */
+    private String gmtModifier;
+    /**
      * calcIntrType 计息方式/计息基准.
      */
     private String calcIntrType;
@@ -48,10 +52,6 @@ public class PlanDO{
      */
     private String planFullName;
     /**
-     * allocPeriodMethod 兑付周期类型.
-     */
-    private String allocPeriodMethod;
-    /**
      * endDate 法定到期日.
      */
     private Date endDate;
@@ -121,22 +121,6 @@ public class PlanDO{
     }
 
     /**
-     * Set allocPeriod 兑付周期.
-     */
-    public void setAllocPeriod(Long allocPeriod){
-        this.allocPeriod = allocPeriod;
-    }
-
-    /**
-     * Get allocPeriod 兑付周期.
-     *
-     * @return the string
-     */
-    public Long getAllocPeriod(){
-        return allocPeriod;
-    }
-
-    /**
      * Set planNo 产品编号.
      */
     public void setPlanNo(String planNo){
@@ -169,6 +153,22 @@ public class PlanDO{
     }
 
     /**
+     * Set payFreq .
+     */
+    public void setPayFreq(String payFreq){
+        this.payFreq = payFreq;
+    }
+
+    /**
+     * Get payFreq .
+     *
+     * @return the string
+     */
+    public String getPayFreq(){
+        return payFreq;
+    }
+
+    /**
      * Set planName 产品简称.
      */
     public void setPlanName(String planName){
@@ -217,6 +217,22 @@ public class PlanDO{
     }
 
     /**
+     * Set gmtModifier 最近更新人.
+     */
+    public void setGmtModifier(String gmtModifier){
+        this.gmtModifier = gmtModifier;
+    }
+
+    /**
+     * Get gmtModifier 最近更新人.
+     *
+     * @return the string
+     */
+    public String getGmtModifier(){
+        return gmtModifier;
+    }
+
+    /**
      * Set calcIntrType 计息方式/计息基准.
      */
     public void setCalcIntrType(String calcIntrType){
@@ -249,22 +265,6 @@ public class PlanDO{
     }
 
     /**
-     * Set allocPeriodMethod 兑付周期类型.
-     */
-    public void setAllocPeriodMethod(String allocPeriodMethod){
-        this.allocPeriodMethod = allocPeriodMethod;
-    }
-
-    /**
-     * Get allocPeriodMethod 兑付周期类型.
-     *
-     * @return the string
-     */
-    public String getAllocPeriodMethod(){
-        return allocPeriodMethod;
-    }
-
-    /**
      * Set endDate 法定到期日.
      */
     public void setEndDate(Date endDate){

app/common/dal/src/main/java/com/abssqr/plat/common/dal/mysql/auto/mapper/LoanDOMapper.java

@@ -9,7 +9,8 @@ import java.lang.String;
 import com.abssqr.plat.common.dal.mysql.auto.paging.CapitalAstUnMatchPage;
 import com.abssqr.plat.common.dal.mysql.auto.resultmap.AstPoolLoanStat;
 import com.abssqr.plat.common.dal.mysql.auto.paging.AstPoolLoanPage;
-import com.abssqr.plat.common.dal.mysql.auto.resultmap.AstPoolLoan;
+import com.abssqr.plat.common.dal.mysql.auto.resultmap.AstLoan;
+import com.abssqr.plat.common.dal.mysql.auto.paging.AstPackAddLoanPage;
 import com.abssqr.plat.common.dal.mysql.auto.paging.AstPackLoanPage;
 import com.abssqr.plat.common.dal.mysql.auto.paging.PackAstPage;
 import org.apache.ibatis.annotations.Param;
@@ -122,21 +123,33 @@ public interface LoanDOMapper{
     /**
      * desc:根据资产池编号查询对应的资产.<br/>
      * @param astPoolLoan astPoolLoan
-     * @return List<AstPoolLoan>
+     * @return List<AstLoan>
      */
-    List<AstPoolLoan> getLoanListByAstPoolNoResult(AstPoolLoanPage astPoolLoan);
+    List<AstLoan> getLoanListByAstPoolNoResult(AstPoolLoanPage astPoolLoan);
+    /**
+     * desc:根据资产池编号查询对应的资产.<br/>
+     * @param astPackAddLoan astPackAddLoan
+     * @return int
+     */
+    int getLoanListForPackAddAstCount(AstPackAddLoanPage astPackAddLoan);
+    /**
+     * desc:根据资产池编号查询对应的资产.<br/>
+     * @param astPackAddLoan astPackAddLoan
+     * @return List<AstLoan>
+     */
+    List<AstLoan> getLoanListForPackAddAstResult(AstPackAddLoanPage astPackAddLoan);
     /**
      * desc:根据资产池编号查询对应的资产.<br/>
      * @param astPackLoan astPackLoan
      * @return int
      */
-    int getLoanListForPackAddAstCount(AstPackLoanPage astPackLoan);
+    int getLoanListForPackCount(AstPackLoanPage astPackLoan);
     /**
      * desc:根据资产池编号查询对应的资产.<br/>
      * @param astPackLoan astPackLoan
-     * @return List<AstPoolLoan>
+     * @return List<AstLoan>
      */
-    List<AstPoolLoan> getLoanListForPackAddAstResult(AstPackLoanPage astPackLoan);
+    List<AstLoan> getLoanListForPackResult(AstPackLoanPage astPackLoan);
     /**
      * desc:根据资产包编号分页获取所有的资产.<br/>
      * @param packAst packAst

app/common/dal/src/main/java/com/abssqr/plat/common/dal/mysql/auto/paging/AstPackAddLoanPage.java

+package com.abssqr.plat.common.dal.mysql.auto.paging;
+
+import com.abssqr.plat.common.dal.mysql.auto.paging.BasePage;
+import com.abssqr.plat.common.dal.mysql.auto.resultmap.AstLoan;
+import java.util.List;
+import com.abssqr.plat.common.facade.model.rule.AstScreenRule;
+import com.abssqr.plat.common.facade.enums.AstTypeEnum;
+
+/**
+ * The table ABS_LOAN 信贷资产
+ */
+public class AstPackAddLoanPage extends BasePage<AstLoan>{
+
+    /**
+     * screenRuleList .
+     */
+    private List<AstScreenRule> screenRuleList;
+    /**
+     * astType .
+     */
+    private AstTypeEnum astType;
+    /**
+     * astPoolNo .
+     */
+    private String astPoolNo;
+
+    /**
+     * Set screenRuleList .
+     */
+    public void setScreenRuleList(List<AstScreenRule> screenRuleList){
+        this.screenRuleList = screenRuleList;
+    }
+
+    /**
+     * Get screenRuleList .
+     *
+     * @return the string
+     */
+    public List<AstScreenRule> getScreenRuleList(){
+        return screenRuleList;
+    }
+
+    /**
+     * Set astType .
+     */
+    public void setAstType(AstTypeEnum astType){
+        this.astType = astType;
+    }
+
+    /**
+     * Get astType .
+     *
+     * @return the string
+     */
+    public AstTypeEnum getAstType(){
+        return astType;
+    }
+
+    /**
+     * Set astPoolNo .
+     */
+    public void setAstPoolNo(String astPoolNo){
+        this.astPoolNo = astPoolNo;
+    }
+
+    /**
+     * Get astPoolNo .
+     *
+     * @return the string
+     */
+    public String getAstPoolNo(){
+        return astPoolNo;
+    }
+}

app/common/dal/src/main/java/com/abssqr/plat/common/dal/mysql/auto/paging/AstPackLoanPage.java

 package com.abssqr.plat.common.dal.mysql.auto.paging;
 
 import com.abssqr.plat.common.dal.mysql.auto.paging.BasePage;
-import com.abssqr.plat.common.dal.mysql.auto.resultmap.AstPoolLoan;
-import java.util.List;
-import com.abssqr.plat.common.facade.model.rule.AstScreenRule;
-import com.abssqr.plat.common.facade.enums.AstTypeEnum;
+import com.abssqr.plat.common.dal.mysql.auto.resultmap.AstLoan;
 
 /**
  * The table ABS_LOAN 信贷资产
  */
-public class AstPackLoanPage extends BasePage<AstPoolLoan>{
+public class AstPackLoanPage extends BasePage<AstLoan>{
 
     /**
-     * screenRuleList .
+     * packNo .
      */
-    private List<AstScreenRule> screenRuleList;
-    /**
-     * astType .
-     */
-    private AstTypeEnum astType;
-    /**
-     * astPoolNo .
-     */
-    private String astPoolNo;
-
-    /**
-     * Set screenRuleList .
-     */
-    public void setScreenRuleList(List<AstScreenRule> screenRuleList){
-        this.screenRuleList = screenRuleList;
-    }
-
-    /**
-     * Get screenRuleList .
-     *
-     * @return the string
-     */
-    public List<AstScreenRule> getScreenRuleList(){
-        return screenRuleList;
-    }
-
-    /**
-     * Set astType .
-     */
-    public void setAstType(AstTypeEnum astType){
-        this.astType = astType;
-    }
-
-    /**
-     * Get astType .
-     *
-     * @return the string
-     */
-    public AstTypeEnum getAstType(){
-        return astType;
-    }
+    private String packNo;
 
     /**
-     * Set astPoolNo .
+     * Set packNo .
      */
-    public void setAstPoolNo(String astPoolNo){
-        this.astPoolNo = astPoolNo;
+    public void setPackNo(String packNo){
+        this.packNo = packNo;
     }
 
     /**
-     * Get astPoolNo .
+     * Get packNo .
      *
      * @return the string
      */
-    public String getAstPoolNo(){
-        return astPoolNo;
+    public String getPackNo(){
+        return packNo;
     }
 }

app/common/dal/src/main/java/com/abssqr/plat/common/dal/mysql/auto/paging/AstPoolLoanPage.java

 package com.abssqr.plat.common.dal.mysql.auto.paging;
 
 import com.abssqr.plat.common.dal.mysql.auto.paging.BasePage;
-import com.abssqr.plat.common.dal.mysql.auto.resultmap.AstPoolLoan;
+import com.abssqr.plat.common.dal.mysql.auto.resultmap.AstLoan;
 
 /**
  * The table ABS_LOAN 信贷资产
  */
-public class AstPoolLoanPage extends BasePage<AstPoolLoan>{
+public class AstPoolLoanPage extends BasePage<AstLoan>{
 
     /**
      * astPoolNo .

app/common/dal/src/main/java/com/abssqr/plat/common/dal/mysql/auto/resultmap/AstPoolLoan.java → app/common/dal/src/main/java/com/abssqr/plat/common/dal/mysql/auto/resultmap/AstLoan.java

@@ -7,9 +7,9 @@ import java.math.BigDecimal;
 
 
 /**
- * The table AstPoolLoan
+ * The table AstLoan
  */
-public class AstPoolLoan  implements Serializable {
+public class AstLoan  implements Serializable {
 
 private static final long serialVersionUID = -1L;
 

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

@@ -67,7 +67,7 @@
         <result column="ALL_PRIN_BAL" property="allPrinBal"  javaType="com.general.system.common.model.Money"/>
         <result column="PACK_PRIN_BAL" property="packPrinBal"  javaType="com.general.system.common.model.Money"/>
     </resultMap>
-    <resultMap id="AstPoolLoan"  type="com.abssqr.plat.common.dal.mysql.auto.resultmap.AstPoolLoan" >
+    <resultMap id="AstLoanResultMap"  type="com.abssqr.plat.common.dal.mysql.auto.resultmap.AstLoan" >
         <result column="FREE_TERM" property="freeTerm"  javaType="Long"/>
         <result column="REPAY_PERIOD" property="repayPeriod"  javaType="Long"/>
         <result column="AST_NO" property="astNo"  javaType="String"/>
@@ -80,6 +80,18 @@
         <result column="PRIN_BAL" property="prinBal"  javaType="com.general.system.common.model.Money"/>
     </resultMap>
 
+    <sql id="pageResltSql">
+        L1.AST_NO, --资产编号
+        L1.PRIN_BAL, --贷款剩余本金
+        L1.START_DATE, --贷款日期
+        L1.TERM_CNT-L1.CUR_TERM AS FREE_TERM, --贷款剩余期限
+        R1.RATE, --贷款利率
+        L1.RISK_CL, --五级分类
+        R1.REPAY_PERIOD, --还款周期
+        R1.REPAY_PERIOD_TYPE, --还款周期类型
+        R1.REPAY_METHOD, --还款方式
+        R4.PLAN_NAME  --资产归属
+    </sql>
     <sql id="Base_SF_Column_List">
         sf.USER_ID,sf.FEE_BAL,sf.INTR_BAL,sf.PRIN_BAL,sf.PAID_FEE_AMT,sf.OVD_PRIN_BAL,sf.OVD_INTR_BAL,sf.OVD_FEE_BAL,sf.OWN_STATUS
         ,sf.FEE_PENAL_BAL,sf.OTHER_FEE_BAL,sf.PAID_INTR_AMT,sf.PAID_PRIN_AMT,sf.INTR_PENAL_BAL
@@ -516,16 +528,21 @@
         FROM
 
             ABS_LOAN L1
-        LEFT JOIN ABS_LOAN_CONTRACT R1 ON L1.AST_NO=R1.AST_NO
-        LEFT JOIN ABS_LOAN_PACK_REL R2 ON L1.AST_NO=R2.AST_NO
-        LEFT JOIN ABS_AST_PACK R3 ON R2.PACK_NO=R3.PACK_NO
-        LEFT JOIN ABS_PLAN R4 ON R3.PLAN_NO=R4.PLAN_NO
+        LEFT JOIN ABS_LOAN_CONTRACT R1
+            ON L1.AST_NO=R1.AST_NO
+        LEFT JOIN ABS_LOAN_PACK_REL R2
+            ON L1.AST_NO=R2.AST_NO
+        LEFT JOIN ABS_AST_PACK R3
+            ON R2.PACK_NO=R3.PACK_NO
+        LEFT JOIN ABS_PLAN R4
+            ON R3.PLAN_NO=R4.PLAN_NO
         WHERE
             R2.STATUS='in'
         AND R3.AST_POOL_NO=#{astPoolNo,jdbcType=VARCHAR}
+        AND L1.STATUS IN ('nor', 'ovd')
     </select>
     <!--根据资产池编号查询对应的资产 pageResult  mydalgen自动生成，请勿修改-->
-    <select id="getLoanListByAstPoolNoResult"  resultMap="AstPoolLoan" >
+    <select id="getLoanListByAstPoolNoResult"  resultMap="AstLoanResultMap" >
     select
         *
     from(
@@ -533,25 +550,21 @@
             tt.*,ROWNUM AS rowno
         from(
                     SELECT
-            L1.AST_NO, --资产编号
-            L1.PRIN_BAL, --贷款剩余本金
-            L1.START_DATE, --贷款日期
-            L1.TERM_CNT-L1.CUR_TERM AS FREE_TERM, --贷款剩余期限
-            R1.RATE, --贷款利率
-            L1.RISK_CL, --五级分类
-            R1.REPAY_PERIOD, --还款周期
-            R1.REPAY_PERIOD_TYPE, --还款周期类型
-            R1.REPAY_METHOD, --还款方式
-            R4.PLAN_NAME  --资产归属
+            <include refid="pageResltSql"/>
         FROM
             ABS_LOAN L1
-        LEFT JOIN ABS_LOAN_CONTRACT R1 ON L1.AST_NO=R1.AST_NO
-        LEFT JOIN ABS_LOAN_PACK_REL R2 ON L1.AST_NO=R2.AST_NO
-        LEFT JOIN ABS_AST_PACK R3 ON R2.PACK_NO=R3.PACK_NO
-        LEFT JOIN ABS_PLAN R4 ON R3.PLAN_NO=R4.PLAN_NO
+        LEFT JOIN ABS_LOAN_CONTRACT R1
+            ON L1.AST_NO=R1.AST_NO
+        LEFT JOIN ABS_LOAN_PACK_REL R2
+            ON L1.AST_NO=R2.AST_NO
+        LEFT JOIN ABS_AST_PACK R3
+            ON R2.PACK_NO=R3.PACK_NO
+        LEFT JOIN ABS_PLAN R4
+            ON R3.PLAN_NO=R4.PLAN_NO
         WHERE
             R2.STATUS='in'
         AND R3.AST_POOL_NO=#{astPoolNo,jdbcType=VARCHAR}
+        AND L1.STATUS IN ('nor', 'ovd')
         ) tt where ROWNUM &lt;= #{endRow}
     ) table_alias
     where table_alias.rowno &gt; #{startRow}
@@ -570,16 +583,21 @@
                     <include refid="ABS_LOAN_PACK_REL.QCDK_SQL"/>
                 </if>
             ) u ON L1.ast_no=u.ast_no
-            LEFT JOIN ABS_LOAN_CONTRACT R1 ON L1.AST_NO=R1.AST_NO
-            LEFT JOIN ABS_LOAN_PACK_REL R2 ON L1.AST_NO=R2.AST_NO
-            LEFT JOIN ABS_AST_PACK R3 ON R2.PACK_NO=R3.PACK_NO
-            LEFT JOIN ABS_PLAN R4 ON R3.PLAN_NO=R4.PLAN_NO
+            LEFT JOIN ABS_LOAN_CONTRACT R1
+                ON L1.AST_NO=R1.AST_NO
+            LEFT JOIN ABS_LOAN_PACK_REL R2
+                ON L1.AST_NO=R2.AST_NO
+            LEFT JOIN ABS_AST_PACK R3
+                ON R2.PACK_NO=R3.PACK_NO
+            LEFT JOIN ABS_PLAN R4
+                ON R3.PLAN_NO=R4.PLAN_NO
         WHERE
             R2.STATUS='in'
             AND R3.AST_POOL_NO=#{astPoolNo,jdbcType=VARCHAR}
+            AND L1.STATUS IN ('nor', 'ovd')
     </select>
     <!--根据资产池编号查询对应的资产 pageResult  mydalgen自动生成，请勿修改-->
-    <select id="getLoanListForPackAddAstResult"  resultMap="AstPoolLoan" >
+    <select id="getLoanListForPackAddAstResult"  resultMap="AstLoanResultMap" >
     select
         *
     from(
@@ -588,16 +606,7 @@
         from(
                     
         SELECT
-            L1.AST_NO, --资产编号
-            L1.PRIN_BAL, --贷款剩余本金
-            L1.START_DATE, --贷款日期
-            L1.TERM_CNT-L1.CUR_TERM AS FREE_TERM, --贷款剩余期限
-            R1.RATE, --贷款利率
-            L1.RISK_CL, --五级分类
-            R1.REPAY_PERIOD, --还款周期
-            R1.REPAY_PERIOD_TYPE, --还款周期类型
-            R1.REPAY_METHOD, --还款方式
-            R4.PLAN_NAME  --资产归属
+            <include refid="pageResltSql"/>
         FROM
             ABS_LOAN L1
             UNION (
@@ -605,13 +614,67 @@
                     <include refid="com.abssqr.plat.common.dal.mysql.auto.mapper.LoanPackRelDOMapper.QCDK_SQL"/>
                 </if>
             ) u ON L1.ast_no=u.ast_no
-            LEFT JOIN ABS_LOAN_CONTRACT R1 ON L1.AST_NO=R1.AST_NO
-            LEFT JOIN ABS_LOAN_PACK_REL R2 ON L1.AST_NO=R2.AST_NO
-            LEFT JOIN ABS_AST_PACK R3 ON R2.PACK_NO=R3.PACK_NO
-            LEFT JOIN ABS_PLAN R4 ON R3.PLAN_NO=R4.PLAN_NO
+            LEFT JOIN ABS_LOAN_CONTRACT R1
+                ON L1.AST_NO=R1.AST_NO
+            LEFT JOIN ABS_LOAN_PACK_REL R2
+                ON L1.AST_NO=R2.AST_NO
+            LEFT JOIN ABS_AST_PACK R3
+                ON R2.PACK_NO=R3.PACK_NO
+            LEFT JOIN ABS_PLAN R4
+                ON R3.PLAN_NO=R4.PLAN_NO
         WHERE
             R2.STATUS='in'
             AND R3.AST_POOL_NO=#{astPoolNo,jdbcType=VARCHAR}
+            AND L1.STATUS IN ('nor', 'ovd')
+        ) tt where ROWNUM &lt;= #{endRow}
+    ) table_alias
+    where table_alias.rowno &gt; #{startRow}
+    </select>
+
+    <!--根据资产池编号查询对应的资产 pageCount  mydalgen自动生成，请勿修改-->
+    <select id="getLoanListForPackCount"  resultType="int"  >
+        SELECT
+          COUNT(*) AS total 
+        FROM
+
+            ABS_LOAN L1
+            LEFT JOIN ABS_LOAN_CONTRACT R1
+                ON L1.AST_NO=R1.AST_NO
+            LEFT JOIN ABS_LOAN_PACK_REL R2
+                ON L1.AST_NO=R2.AST_NO
+            LEFT JOIN ABS_AST_PACK R3
+                ON R2.PACK_NO=R3.PACK_NO
+            LEFT JOIN ABS_PLAN R4
+                ON R3.PLAN_NO=R4.PLAN_NO
+        WHERE
+            R2.STATUS='in'
+        AND R2.PACK_NO         = #{packNo,jdbcType=VARCHAR}
+        AND L1.STATUS IN ('nor', 'ovd')
+    </select>
+    <!--根据资产池编号查询对应的资产 pageResult  mydalgen自动生成，请勿修改-->
+    <select id="getLoanListForPackResult"  resultMap="AstLoanResultMap" >
+    select
+        *
+    from(
+        select
+            tt.*,ROWNUM AS rowno
+        from(
+                    SELECT
+            <include refid="pageResltSql"/>
+        FROM
+            ABS_LOAN L1
+            LEFT JOIN ABS_LOAN_CONTRACT R1
+                ON L1.AST_NO=R1.AST_NO
+            LEFT JOIN ABS_LOAN_PACK_REL R2
+                ON L1.AST_NO=R2.AST_NO
+            LEFT JOIN ABS_AST_PACK R3
+                ON R2.PACK_NO=R3.PACK_NO
+            LEFT JOIN ABS_PLAN R4
+                ON R3.PLAN_NO=R4.PLAN_NO
+        WHERE
+            R2.STATUS='in'
+        AND R2.PACK_NO         = #{packNo,jdbcType=VARCHAR}
+        AND L1.STATUS IN ('nor', 'ovd')
         ) tt where ROWNUM &lt;= #{endRow}
     ) table_alias
     where table_alias.rowno &gt; #{startRow}

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

@@ -5,15 +5,15 @@
     <resultMap id="BaseResultMap"  type="com.abssqr.plat.common.dal.mysql.auto.dataobject.PlanDO">
         <id column="ID" property="id" jdbcType="DECIMAL" javaType="Long"/>
         <result column="TOTAL_AMT" property="totalAmt" jdbcType="DECIMAL" javaType="Long"/>
-        <result column="ALLOC_PERIOD" property="allocPeriod" jdbcType="DECIMAL" javaType="Long"/>
         <result column="PLAN_NO" property="planNo" jdbcType="VARCHAR" javaType="String"/>
         <result column="STATUS" property="status" jdbcType="VARCHAR" javaType="String"/>
+        <result column="PAY_FREQ" property="payFreq" jdbcType="VARCHAR" javaType="String"/>
         <result column="PLAN_NAME" property="planName" jdbcType="VARCHAR" javaType="String"/>
         <result column="GMT_CREATOR" property="gmtCreator" jdbcType="VARCHAR" javaType="String"/>
         <result column="TRADE_PLACE" property="tradePlace" jdbcType="VARCHAR" javaType="String"/>
+        <result column="GMT_MODIFIER" property="gmtModifier" jdbcType="VARCHAR" javaType="String"/>
         <result column="CALC_INTR_TYPE" property="calcIntrType" jdbcType="VARCHAR" javaType="String"/>
         <result column="PLAN_FULL_NAME" property="planFullName" jdbcType="VARCHAR" javaType="String"/>
-        <result column="ALLOC_PERIOD_METHOD" property="allocPeriodMethod" jdbcType="VARCHAR" javaType="String"/>
         <result column="END_DATE" property="endDate" jdbcType="DATE" javaType="java.util.Date"/>
         <result column="BEGIN_DATE" property="beginDate" jdbcType="DATE" javaType="java.util.Date"/>
         <result column="GMT_CREATE" property="gmtCreate" jdbcType="DATE" javaType="java.util.Date"/>

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

@@ -5,7 +5,7 @@ import com.abssqr.plat.common.facade.enums.EventCodeEnum;
 
 public class AstPageQryParam extends BasePageQryParam{
     private String astPoolNo;
-
+    private String packNo;
     public String getAstPoolNo() {
         return astPoolNo;
     }
@@ -14,6 +14,14 @@ public class AstPageQryParam extends BasePageQryParam{
         this.astPoolNo = astPoolNo;
     }
 
+    public String getPackNo() {
+        return packNo;
+    }
+
+    public void setPackNo(String packNo) {
+        this.packNo = packNo;
+    }
+
     @Override
     public EventCodeEnum getEventCode() {
         return EventCodeEnum.ADMIN_DTL_QRY;

app/common/facade/src/main/java/com/abssqr/plat/common/facade/result/ast/AstPoolLoanVO.java → app/common/facade/src/main/java/com/abssqr/plat/common/facade/result/ast/AstLoanVO.java

 package com.abssqr.plat.common.facade.result.ast;
 
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
 import com.abssqr.plat.common.facade.enums.AstRiskClassEnum;
 import com.abssqr.plat.common.facade.enums.RepayMethodEnum;
+
 import com.general.system.common.model.BaseEntity;
 import com.general.system.common.model.Money;
 
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-public class AstPoolLoanVO extends BaseEntity implements Serializable {
+public class AstLoanVO extends BaseEntity implements Serializable {
     //资产编号
     private String astNo;
     //贷款剩余本金

app/common/facade/src/main/java/com/abssqr/plat/common/facade/service/ast/AstPoolService.java

@@ -4,11 +4,9 @@ import com.abssqr.plat.common.facade.param.ast.AstPageQryParam;
 import com.abssqr.plat.common.facade.param.astPool.AstPoolOprParam;
 import com.abssqr.plat.common.facade.param.astPool.AstPoolPageQryParam;
 import com.abssqr.plat.common.facade.result.BasePage;
-import com.abssqr.plat.common.facade.result.ast.AstPoolLoanVO;
+import com.abssqr.plat.common.facade.result.ast.AstLoanVO;
 import com.abssqr.plat.common.facade.result.astPool.AstPoolVO;
 
-import java.util.List;
-
 /**
  * 资产池服务
  */
@@ -35,10 +33,5 @@ public interface AstPoolService {
      */
     AstPoolVO get(String astPoolNo);
 
-    /**
-     * 查询资产列表
-     * @param astPageQryParam
-     * @return
-     */
-    BasePage<AstPoolLoanVO> astList(AstPageQryParam astPageQryParam);
+
 }

app/common/facade/src/main/java/com/abssqr/plat/common/facade/service/ast/AstService.java

 package com.abssqr.plat.common.facade.service.ast;
 
 import com.abssqr.plat.common.facade.param.ast.AstDownLoadParam;
+import com.abssqr.plat.common.facade.param.ast.AstPageQryParam;
+import com.abssqr.plat.common.facade.result.BasePage;
+import com.abssqr.plat.common.facade.result.ast.AstLoanVO;
 
 import javax.servlet.Servlet;
 import javax.servlet.ServletOutputStream;
@@ -14,4 +17,15 @@ public interface AstService {
      * @param response
      */
     void downLoadAstFile(AstDownLoadParam astDownLoadParam, HttpServletResponse response);
+
+    /**
+     * 查询资产列表
+     * @param astPageQryParam
+     * @return
+     */
+    BasePage<AstLoanVO> poolAstList(AstPageQryParam astPageQryParam);
+
+    BasePage<AstLoanVO> packAstList(AstPageQryParam astPageQryParam);
+
+    BasePage<AstLoanVO> packAddAstList(AstPageQryParam astPageQryParam);
 }

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

+package com.abssqr.plat.common.model.convertor.web;
+
+
+import com.abssqr.plat.common.dal.mysql.auto.paging.AstPoolLoanPage;
+import com.abssqr.plat.common.dal.mysql.auto.resultmap.AstLoan;
+import com.abssqr.plat.common.facade.enums.AstRiskClassEnum;
+import com.abssqr.plat.common.facade.enums.RepayMethodEnum;
+import com.abssqr.plat.common.facade.param.ast.AstPageQryParam;
+import com.abssqr.plat.common.facade.result.BasePage;
+import com.abssqr.plat.common.facade.result.ast.AstLoanVO;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.collections.CollectionUtils;
+
+public class AstLoanWebConvert {
+    public static AstLoanVO convert2AstPoolVO(AstLoan astLoan){
+        AstLoanVO astPoolLoanVO=new AstLoanVO();
+        astPoolLoanVO.setAstNo(astLoan.getAstNo());
+        astPoolLoanVO.setFreeTerm(astLoan.getFreeTerm());
+        astPoolLoanVO.setPlanName(astLoan.getPlanName());
+        astPoolLoanVO.setPrinBal(astLoan.getPrinBal());
+        astPoolLoanVO.setRate(astLoan.getRate());
+        astPoolLoanVO.setRepayMethod(RepayMethodEnum.getByCode(astLoan.getRepayMethod()));
+        astPoolLoanVO.setRepayPeriod(astLoan.getRepayPeriod());
+        astPoolLoanVO.setRepayPeriodType(astLoan.getRepayPeriodType());
+        astPoolLoanVO.setRiskCl(AstRiskClassEnum.getByCode(astLoan.getRiskCl()));
+        astPoolLoanVO.setStartDate(astLoan.getStartDate());
+        return astPoolLoanVO;
+    }
+
+
+
+    public static BasePage<AstLoanVO> convert2AstPoolVOs(
+        com.abssqr.plat.common.dal.mysql.auto.paging.BasePage<AstLoan> page) {
+        BasePage<AstLoanVO> result=new BasePage<>();
+        List<AstLoanVO> astLoanVOS=new ArrayList<>();
+        if(CollectionUtils.isNotEmpty(page.getDatas())) {
+            page.getDatas().forEach(v -> {
+                astLoanVOS.add(convert2AstPoolVO(v));
+            });
+        }
+        result.setDatas(astLoanVOS);
+        result.setTotal(page.getTotal());
+        result.setCurrPageNo(page.getCurrPageNo());
+        result.setLimit(page.getLimit());
+        return result;
+    }
+}

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

-package com.abssqr.plat.common.model.convertor.web;
-
-
-import com.abssqr.plat.common.dal.mysql.auto.paging.AstPoolLoanPage;
-import com.abssqr.plat.common.dal.mysql.auto.resultmap.AstPoolLoan;
-import com.abssqr.plat.common.facade.enums.AstRiskClassEnum;
-import com.abssqr.plat.common.facade.enums.RepayMethodEnum;
-import com.abssqr.plat.common.facade.param.ast.AstPageQryParam;
-import com.abssqr.plat.common.facade.result.BasePage;
-import com.abssqr.plat.common.facade.result.ast.AstPoolLoanVO;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-public class AstPoolLoanWebConvert {
-    public static AstPoolLoanVO convertAstPoolLoan2AstPoolVO(AstPoolLoan absPoolLoan){
-        AstPoolLoanVO astPoolLoanVO=new AstPoolLoanVO();
-        astPoolLoanVO.setAstNo(absPoolLoan.getAstNo());
-        astPoolLoanVO.setFreeTerm(absPoolLoan.getFreeTerm());
-        astPoolLoanVO.setPlanName(absPoolLoan.getPlanName());
-        astPoolLoanVO.setPrinBal(absPoolLoan.getPrinBal());
-        astPoolLoanVO.setRate(absPoolLoan.getRate());
-        astPoolLoanVO.setRepayMethod(RepayMethodEnum.getByCode(absPoolLoan.getRepayMethod()));
-        astPoolLoanVO.setRepayPeriod(absPoolLoan.getRepayPeriod());
-        astPoolLoanVO.setRepayPeriodType(absPoolLoan.getRepayPeriodType());
-        astPoolLoanVO.setRiskCl(AstRiskClassEnum.getByCode(absPoolLoan.getRiskCl()));
-        astPoolLoanVO.setStartDate(absPoolLoan.getStartDate());
-        return astPoolLoanVO;
-    }
-
-
-    public static BasePage<AstPoolLoanVO> convertAstPoolLoan2AstPoolVOs(AstPoolLoanPage page){
-        BasePage<AstPoolLoanVO> result=new BasePage<>();
-        List<AstPoolLoanVO> astPoolLoanVOS=new ArrayList<>();
-        page.getDatas().forEach(v->{
-            astPoolLoanVOS.add(convertAstPoolLoan2AstPoolVO(v));
-        });
-        result.setDatas(astPoolLoanVOS);
-        result.setTotal(page.getTotal());
-        result.setCurrPageNo(page.getCurrPageNo());
-        result.setLimit(page.getLimit());
-        return result;
-    }
-
-    public static AstPoolLoanPage convertAstParam2AstPage(AstPageQryParam astPageQryParam){
-        AstPoolLoanPage astPoolLoanPage=new AstPoolLoanPage();
-        astPoolLoanPage.setAstPoolNo(astPageQryParam.getAstPoolNo());
-        astPoolLoanPage.setCurrPageNo(astPageQryParam.getPageNum());
-        astPoolLoanPage.setLimit(astPageQryParam.getPageNum());
-        return astPoolLoanPage;
-    }
-}

app/common/model/src/main/java/com/abssqr/plat/common/model/repo/ast/LoanRepository.java

@@ -6,7 +6,6 @@
 package com.abssqr.plat.common.model.repo.ast;
 
 import com.abssqr.plat.common.dal.mysql.auto.paging.*;
-import com.abssqr.plat.common.dal.mysql.auto.resultmap.AstPoolLoan;
 import com.abssqr.plat.common.dal.mysql.auto.resultmap.AstPoolLoanStat;
 import com.abssqr.plat.common.facade.param.loan.LoanPageQryParam;
 import com.abssqr.plat.common.model.domain.ast.Loan;
@@ -119,5 +118,9 @@ public interface LoanRepository {
     PackAstPage getLoanPageByPackNo(PackAstPage packAstPage);
 
 
+    AstPoolLoanPage getLoanPageByPoolNo(AstPoolLoanPage astPoolLoanPage);
 
+    AstPackAddLoanPage getLoanPageForPackAddAst(AstPackAddLoanPage astPackLoan);
+
+    AstPackLoanPage getLoanListForPack(AstPackLoanPage astPackLoan);
 }

app/common/model/src/main/java/com/abssqr/plat/common/model/repo/ast/impl/LoanRepositoryImpl.java

@@ -5,22 +5,31 @@
 
 package com.abssqr.plat.common.model.repo.ast.impl;
 
-import cn.hutool.core.util.StrUtil;
+import java.util.Date;
+import java.util.List;
+
 import com.abssqr.plat.common.dal.mysql.auto.dao.LoanBakDAO;
 import com.abssqr.plat.common.dal.mysql.auto.dao.LoanContractDAO;
 import com.abssqr.plat.common.dal.mysql.auto.dao.LoanDAO;
 import com.abssqr.plat.common.dal.mysql.auto.dataobject.LoanBakDO;
-import com.abssqr.plat.common.dal.mysql.auto.paging.*;
-import com.abssqr.plat.common.dal.mysql.auto.resultmap.AstPoolLoan;
+import com.abssqr.plat.common.dal.mysql.auto.paging.AstPackAddLoanPage;
+import com.abssqr.plat.common.dal.mysql.auto.paging.AstPackLoanPage;
+import com.abssqr.plat.common.dal.mysql.auto.paging.AstPoolLoanPage;
+import com.abssqr.plat.common.dal.mysql.auto.paging.CapitalAstMatchPage;
+import com.abssqr.plat.common.dal.mysql.auto.paging.CapitalAstUnMatchPage;
+import com.abssqr.plat.common.dal.mysql.auto.paging.LoanBakListPage;
+import com.abssqr.plat.common.dal.mysql.auto.paging.LoanListPage;
+import com.abssqr.plat.common.dal.mysql.auto.paging.PackAstPage;
 import com.abssqr.plat.common.dal.mysql.auto.resultmap.AstPoolLoanStat;
 import com.abssqr.plat.common.facade.param.loan.LoanPageQryParam;
 import com.abssqr.plat.common.model.convertor.LoanConvert;
-import com.abssqr.plat.common.model.domain.ast.AstPoolEntity;
 import com.abssqr.plat.common.model.domain.ast.Loan;
 import com.abssqr.plat.common.model.domain.ast.LoanBak;
 import com.abssqr.plat.common.model.repo.ast.LoanRepository;
 import com.abssqr.plat.common.model.repo.astPool.AstPoolRepository;
 import com.abssqr.plat.common.util.profiler.PerformTrace;
+
+import cn.hutool.core.util.StrUtil;
 import com.general.system.common.model.Money;
 import com.google.common.collect.Lists;
 import org.apache.commons.collections.CollectionUtils;
@@ -28,9 +37,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.Date;
-import java.util.List;
-
 /**
  * 贷款资产仓储
  *
@@ -183,6 +189,20 @@ public class LoanRepositoryImpl implements LoanRepository {
         return result;
     }
 
+    @Override
+    public AstPoolLoanPage getLoanPageByPoolNo(AstPoolLoanPage astPoolLoanPage) {
+        AstPoolLoanPage loanListByAstPoolNo = loanDAO.getLoanListByAstPoolNo(astPoolLoanPage);
+        return loanListByAstPoolNo;
+    }
 
-
+    @Override
+    public AstPackAddLoanPage getLoanPageForPackAddAst(AstPackAddLoanPage astPackLoan){
+        AstPackAddLoanPage astPackLoanPage = loanDAO.getLoanListForPackAddAst(astPackLoan);
+        return astPackLoanPage;
+    }
+    @Override
+    public AstPackLoanPage getLoanListForPack(AstPackLoanPage astPackLoan){
+        AstPackLoanPage astPackLoanPage = loanDAO.getLoanListForPack(astPackLoan);
+        return astPackLoanPage;
+    }
 }

app/common/model/src/main/java/com/abssqr/plat/common/model/repo/astPool/AstPoolRepository.java

@@ -40,6 +40,4 @@ public interface AstPoolRepository {
      * @return
      */
     AstPoolEntity lockAstPool(String astPoolNo);
-
-    AstPoolLoanPage astPage(AstPoolLoanPage astPoolLoanPage);
 }
\ No newline at end of file

app/common/model/src/main/java/com/abssqr/plat/common/model/repo/astPool/impl/AstPoolRepositoryImpl.java

@@ -58,11 +58,7 @@ public class AstPoolRepositoryImpl implements AstPoolRepository {
         return true;
     }
 
-    @Override
-    public AstPoolLoanPage astPage(AstPoolLoanPage astPoolLoanPage) {
-        AstPoolLoanPage loanListByAstPoolNo = loanDAO.getLoanListByAstPoolNo(astPoolLoanPage);
-        return loanListByAstPoolNo;
-    }
+
 
     /**
      * 锁

app/test/src/test/java/com/abssqr/plat/test/unittest/astPool/AstListUnitTest.java

@@ -6,7 +6,7 @@ package com.abssqr.plat.test.unittest.astPool; /**
 
 import com.abssqr.plat.common.facade.param.ast.AstPageQryParam;
 import com.abssqr.plat.common.facade.result.BasePage;
-import com.abssqr.plat.common.facade.result.ast.AstPoolLoanVO;
+import com.abssqr.plat.common.facade.result.ast.AstLoanVO;
 import com.abssqr.plat.common.facade.service.ast.AstPoolService;
 import com.abssqr.plat.test.BaseAutoTests;
 import com.abssqr.test.annotation.XTest;
@@ -28,7 +28,7 @@ public class AstListUnitTest extends BaseAutoTests {
     @Test(dataProvider = "YamlDataProvider", description = "资产列表查询")
     public void add(ICase iCase, AstPageQryParam astPageQryParam,String checkGet) {
         try {
-            BasePage<AstPoolLoanVO> astPoolLoanVOBasePage = astPoolService.astList(astPageQryParam);
+            BasePage<AstLoanVO> astPoolLoanVOBasePage = astPoolService.astList(astPageQryParam);
             VarChecker.checkArgument(checkGet.equals(new Gson().toJson(astPoolLoanVOBasePage)),"查询不符合预期");
         } finally {
             // 校验数据

app/web/src/main/java/com/abssqr/plat/web/controller/ast/AstController.java

 package com.abssqr.plat.web.controller.ast;
 
-import cn.hutool.poi.excel.ExcelUtil;
-import cn.hutool.poi.excel.ExcelWriter;
+import javax.servlet.http.HttpServletResponse;
+
 import com.abssqr.plat.common.facade.enums.LoanFieldEnum;
 import com.abssqr.plat.common.facade.param.ast.AstDownLoadParam;
-import com.abssqr.plat.common.facade.service.ast.AstPoolService;
+import com.abssqr.plat.common.facade.param.ast.AstPageQryParam;
+import com.abssqr.plat.common.facade.result.BasePage;
+import com.abssqr.plat.common.facade.result.ast.AstLoanVO;
 import com.abssqr.plat.common.facade.service.ast.AstService;
+
 import com.general.enhanced.controller.annotation.RestJsonController;
 import com.general.system.common.model.BaseResult;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
-import java.io.UnsupportedEncodingException;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 @RestJsonController
 public class AstController {
@@ -29,5 +31,36 @@ public class AstController {
         astService.downLoadAstFile(astDownLoadParam,response);
     }
 
+    /**
+     * 查询资产列表
+     *
+     * @param astPageQryParam
+     * @return
+     */
+    @RequestMapping("ast/poolAstList.json")
+    public BasePage<AstLoanVO> poolAstList(@RequestBody AstPageQryParam astPageQryParam) {
+        return astService.poolAstList(astPageQryParam);
+    }
+
+    /**
+     * 查询资产列表
+     *
+     * @param astPageQryParam
+     * @return
+     */
+    @RequestMapping("ast/packAstList.json")
+    public BasePage<AstLoanVO> packAstList(@RequestBody AstPageQryParam astPageQryParam) {
+        return astService.packAstList(astPageQryParam);
+    }
 
+    /**
+     * 查询资产列表
+     *
+     * @param astPageQryParam
+     * @return
+     */
+    @RequestMapping("ast/packAddAstList.json")
+    public BasePage<AstLoanVO> packAddAstList(@RequestBody AstPageQryParam astPageQryParam) {
+        return astService.packAddAstList(astPageQryParam);
+    }
 }

app/web/src/main/java/com/abssqr/plat/web/controller/astPool/AstPoolController.java

@@ -4,7 +4,7 @@ import com.abssqr.plat.common.facade.param.ast.AstPageQryParam;
 import com.abssqr.plat.common.facade.param.astPool.AstPoolOprParam;
 import com.abssqr.plat.common.facade.param.astPool.AstPoolPageQryParam;
 import com.abssqr.plat.common.facade.result.BasePage;
-import com.abssqr.plat.common.facade.result.ast.AstPoolLoanVO;
+import com.abssqr.plat.common.facade.result.ast.AstLoanVO;
 import com.abssqr.plat.common.facade.result.astPool.AstPoolVO;
 import com.abssqr.plat.common.facade.service.ast.AstPoolService;
 import com.general.enhanced.controller.annotation.RestJsonController;
@@ -48,15 +48,4 @@ public class AstPoolController {
     }
 
 
-    /**
-     * 查询资产列表
-     * @param astPageQryParam
-     * @return
-     */
-    @RequestMapping("astPool/astList.json")
-    public BasePage<AstPoolLoanVO> astList(@RequestBody AstPageQryParam astPageQryParam){
-        return  astPoolService.astList(astPageQryParam);
-    }
-
-
 }