Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
bb
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abs_pom
bb
Commits
571b820b
Commit
571b820b
authored
Apr 21, 2020
by
夏晨翔
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
U 更新 资产包代码
parent
0f8d4e6e
Show whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
113 additions
and
115 deletions
+113
-115
app/common/dal/dalgen/AbssqrCoreTables/ABS_AST_PACK.xml
+17
-16
app/common/dal/dalgen/AbssqrCoreTables/ABS_AST_POOL.xml
+3
-3
app/common/dal/src/main/java/com/abssqr/plat/common/dal/mysql/auto/dataobject/AstPackDO.java
+36
-36
app/common/dal/src/main/resources/com/abssqr/plat/common/dal/mysql/auto/mapper/AstPackDOMapper.xml
+22
-20
app/common/dal/src/main/resources/com/abssqr/plat/common/dal/mysql/auto/mapper/AstPoolDOMapper.xml
+3
-3
app/common/facade/src/main/java/com/abssqr/plat/common/facade/enums/AstPackTypeEnum.java
+1
-1
app/common/facade/src/main/java/com/abssqr/plat/common/facade/param/ast/AstPackOprParam.java
+5
-5
app/common/model/src/main/java/com/abssqr/plat/common/model/convertor/AstPackConvert.java
+4
-8
app/common/model/src/main/java/com/abssqr/plat/common/model/domain/ast/AstPack.java
+10
-10
app/core/service/src/main/java/com/abssqr/plat/core/service/ast/AstPackManager.java
+2
-3
app/test/src/test/resources/testdata/unittest/pack/add/pack_add_case0001.yaml
+3
-3
app/test/src/test/resources/testdata/unittest/pack/list/pack_list_case0001.yaml
+2
-2
doc/一期/ABS_AST_PACK.sql
+5
-5
No files found.
app/common/dal/dalgen/AbssqrCoreTables/ABS_AST_PACK.xml
View file @
571b820b
...
...
@@ -3,16 +3,16 @@
<!-- 特殊字符说明 <> <> -->
<!-- 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}
, #{
t
ype,jdbcType=VARCHAR}
, #{
packT
ype,jdbcType=VARCHAR}
, #{packNo,jdbcType=VARCHAR}
, #{planNo,jdbcType=VARCHAR}
, #{status,jdbcType=VARCHAR}
...
...
@@ -44,7 +44,7 @@
, sysdate
, sysdate
, #{packSubmitDate,jdbcType=DATE}
, #{astType
Code
,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.
t
ype,jdbcType=VARCHAR}
, #{item.
packT
ype,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.astType
Code
,jdbcType=VARCHAR}
, #{item.astType,jdbcType=VARCHAR}
)
</foreach>
</operation>
...
...
@@ -129,7 +129,7 @@
UPDATE abs_ast_pack
SET
AVAL_AMT = #{avalAmt,jdbcType=DECIMAL}
,
TYPE = #{t
ype,jdbcType=VARCHAR}
,
PACK_TYPE = #{packT
ype,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 = #{astTypeCod
e,jdbcType=VARCHAR}
,AST_TYPE
= #{astTyp
e,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
View file @
571b820b
...
...
@@ -27,7 +27,7 @@
, #{astPoolNo,jdbcType=VARCHAR}
, sysdate
, #{astPoolName,jdbcType=VARCHAR}
, #{astType
Code
,jdbcType=VARCHAR}
, #{astType,jdbcType=VARCHAR}
, sysdate
)
]]>
...
...
@@ -50,7 +50,7 @@
, #{item.astPoolNo,jdbcType=VARCHAR}
, sysdate
, #{item.astPoolName,jdbcType=VARCHAR}
, #{item.astType
Code
,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 = #{astType
Code
,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
View file @
571b820b
...
...
@@ -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
;
/**
* ast
TypeCode 准入资产代码
.
* ast
PoolNo 资产池编号
.
*/
private
String
ast
TypeCode
;
private
String
ast
PoolNo
;
/**
* 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
set
AstPoolNo
(
String
astPoolNo
){
this
.
astPoolNo
=
astPoolNo
;
public
void
set
PackType
(
String
packType
){
this
.
packType
=
packType
;
}
/**
* Get
astPoolNo 资产池编号
.
* Get
packType 资产包类型: 1. 正常 NORMAL 2.默认(虚拟) DEFAULT
.
*
* @return the string
*/
public
String
get
AstPoolNo
(){
return
astPoolNo
;
public
String
get
PackType
(){
return
packType
;
}
/**
* Set ast
TypeCode 准入资产代码
.
* Set ast
PoolNo 资产池编号
.
*/
public
void
setAst
TypeCode
(
String
astTypeCode
){
this
.
ast
TypeCode
=
astTypeCode
;
public
void
setAst
PoolNo
(
String
astPoolNo
){
this
.
ast
PoolNo
=
astPoolNo
;
}
/**
* Get ast
TypeCode 准入资产代码
.
* Get ast
PoolNo 资产池编号
.
*
* @return the string
*/
public
String
getAst
TypeCode
(){
return
ast
TypeCode
;
public
String
getAst
PoolNo
(){
return
ast
PoolNo
;
}
/**
...
...
app/common/dal/src/main/resources/com/abssqr/plat/common/dal/mysql/auto/mapper/AstPackDOMapper.xml
View file @
571b820b
...
...
@@ -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}
, #{
t
ype,jdbcType=VARCHAR}
, #{
packT
ype,jdbcType=VARCHAR}
, #{packNo,jdbcType=VARCHAR}
, #{planNo,jdbcType=VARCHAR}
, #{status,jdbcType=VARCHAR}
...
...
@@ -67,7 +67,7 @@
, sysdate
, sysdate
, #{packSubmitDate,jdbcType=DATE}
, #{astType
Code
,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.
t
ype,jdbcType=VARCHAR}
, #{item.
packT
ype,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.astType
Code
,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 = #{t
ype,jdbcType=VARCHAR}
,
PACK_TYPE = #{packT
ype,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 = #{astTypeCod
e,jdbcType=VARCHAR}
,AST_TYPE
= #{astTyp
e,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
<
= #{endRow}
) table_alias
...
...
app/common/dal/src/main/resources/com/abssqr/plat/common/dal/mysql/auto/mapper/AstPoolDOMapper.xml
View file @
571b820b
...
...
@@ -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=
"astType
Code
"
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}
, #{astType
Code
,jdbcType=VARCHAR}
, #{astType,jdbcType=VARCHAR}
, sysdate
)
]]>
...
...
@@ -60,7 +60,7 @@
, #{item.astPoolNo,jdbcType=VARCHAR}
, sysdate
, #{item.astPoolName,jdbcType=VARCHAR}
, #{item.astType
Code
,jdbcType=VARCHAR}
, #{item.astType,jdbcType=VARCHAR}
, sysdate
)
</foreach>
...
...
app/common/facade/src/main/java/com/abssqr/plat/common/facade/enums/AstPackTypeEnum.java
View file @
571b820b
...
...
@@ -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
View file @
571b820b
...
...
@@ -55,7 +55,7 @@ public class AstPackOprParam extends BaseOprParam {
* 资产类型
*/
@VldEnums
(
enumClass
=
AstTypeEnum
.
class
,
message
=
"不支持的资产类型"
)
private
String
astType
Code
;
private
String
astType
;
public
String
getPackNo
()
{
return
packNo
;
...
...
@@ -100,12 +100,12 @@ public class AstPackOprParam extends BaseOprParam {
this
.
astPoolNo
=
astPoolNo
;
}
public
String
getAstType
Code
()
{
return
astType
Code
;
public
String
getAstType
()
{
return
astType
;
}
public
void
setAstType
Code
(
String
astTypeCod
e
)
{
this
.
astType
Code
=
astTypeCod
e
;
public
void
setAstType
(
String
astTyp
e
)
{
this
.
astType
=
astTyp
e
;
}
@Override
...
...
app/common/model/src/main/java/com/abssqr/plat/common/model/convertor/AstPackConvert.java
View file @
571b820b
...
...
@@ -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
.
set
Type
(
AstPackTypeEnum
.
getByCode
(
param
.
get
Type
()));
result
.
set
PackType
(
AstPackTypeEnum
.
getByCode
(
param
.
getPack
Type
()));
//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
.
set
Type
(
Optional
.
ofNullable
(
param
.
get
Type
()).
map
(
AstPackTypeEnum:
:
getCode
).
orElse
(
null
));
result
.
set
PackType
(
Optional
.
ofNullable
(
param
.
getPack
Type
()).
map
(
AstPackTypeEnum:
:
getCode
).
orElse
(
null
));
//packNo 资产包编号
result
.
setPackNo
(
param
.
getPackNo
());
//planNo 产品编号
...
...
@@ -77,7 +72,7 @@ public class AstPackConvert {
//packSubmitDate 封包提交日
result
.
setPackSubmitDate
(
param
.
getPackSubmitDate
());
result
.
setAstType
Code
(
Optional
.
ofNullable
(
param
.
getAstTypeCod
e
()).
map
(
AstTypeEnum:
:
getCode
).
orElse
(
null
));
result
.
setAstType
(
Optional
.
ofNullable
(
param
.
getAstTyp
e
()).
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
View file @
571b820b
...
...
@@ -28,7 +28,7 @@ public class AstPack {
/**
* type 资产包类型: 1. 正常 NORMAL 2.默认(虚拟) DEFAULT.
*/
private
AstPackTypeEnum
t
ype
;
private
AstPackTypeEnum
packT
ype
;
/**
* packNo 资产包编号.
*/
...
...
@@ -65,7 +65,7 @@ public class AstPack {
/**
* 资产类型
*/
private
AstTypeEnum
astType
Code
;
private
AstTypeEnum
astType
;
public
Money
getAvalAmt
()
{
return
avalAmt
;
...
...
@@ -75,12 +75,12 @@ public class AstPack {
this
.
avalAmt
=
avalAmt
;
}
public
AstPackTypeEnum
getType
()
{
return
t
ype
;
public
AstPackTypeEnum
get
Pack
Type
()
{
return
packT
ype
;
}
public
void
set
Type
(
AstPackTypeEnum
t
ype
)
{
this
.
type
=
t
ype
;
public
void
set
PackType
(
AstPackTypeEnum
packT
ype
)
{
this
.
packType
=
packT
ype
;
}
public
String
getPackNo
()
{
...
...
@@ -147,11 +147,11 @@ public class AstPack {
this
.
screenRuleList
=
screenRuleList
;
}
public
AstTypeEnum
getAstType
Code
()
{
return
astType
Code
;
public
AstTypeEnum
getAstType
()
{
return
astType
;
}
public
void
setAstType
Code
(
AstTypeEnum
astTypeCod
e
)
{
this
.
astType
Code
=
astTypeCod
e
;
public
void
setAstType
(
AstTypeEnum
astTyp
e
)
{
this
.
astType
=
astTyp
e
;
}
}
app/core/service/src/main/java/com/abssqr/plat/core/service/ast/AstPackManager.java
View file @
571b820b
...
...
@@ -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
.
set
Pack
Type
(
AstPackTypeEnum
.
NORMAL
);
result
.
setStatus
(
AstPackStatusEnum
.
INIT
);
result
.
setAstType
Code
(
AstTypeEnum
.
getByCode
(
param
.
getAstTypeCod
e
()));
result
.
setAstType
(
AstTypeEnum
.
getByCode
(
param
.
getAstTyp
e
()));
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
View file @
571b820b
...
...
@@ -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
astType
Code
:
QCDK
astType
:
QCDK
screenRuleList
:
-
ruleType
:
QCDK_RISK_TYPE
leftValue
:
...
...
app/test/src/test/resources/testdata/unittest/pack/list/pack_list_case0001.yaml
View file @
571b820b
...
...
@@ -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
View file @
571b820b
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
'创建时间'
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment