Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dcs-plan
Project
Project
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
INET-TWO
server
dcs-plan
Commits
34040fee
Commit
34040fee
authored
Oct 30, 2024
by
wangqiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
标准增加组织结构
parent
0cba4713
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
112 additions
and
74 deletions
+112
-74
ExtStandardVO.java
...main/java/com/yonde/dcs/plan/common/vo/ExtStandardVO.java
+67
-37
ExtStandard.java
...c/main/java/com/yonde/dcs/plan/entity/po/ExtStandard.java
+45
-37
No files found.
dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/vo/ExtStandardVO.java
View file @
34040fee
...
@@ -42,16 +42,18 @@ import com.yonde.dex.lcycle.plugin.common.entity.DxLifecycleManageBaseVOHolder;
...
@@ -42,16 +42,18 @@ import com.yonde.dex.lcycle.plugin.common.entity.DxLifecycleManageBaseVOHolder;
import
com.yonde.dex.lcycle.plugin.common.entity.DxLifecycleManageBaseVOEmbeddable
;
import
com.yonde.dex.lcycle.plugin.common.entity.DxLifecycleManageBaseVOEmbeddable
;
import
com.yonde.dex.basedata.entity.vo.IdVO
;
import
com.yonde.dex.basedata.entity.vo.IdVO
;
import
com.yonde.dex.secretcode.plugin.common.entity.DxSecretVOEmbeddable
;
import
com.yonde.dex.secretcode.plugin.common.entity.DxSecretVOEmbeddable
;
import
com.yonde.dex.user.common.vo.DxOrganizationVO
;
import
com.yonde.dex.container.folder.plugin.common.entity.DxObjFolderVOHolder
;
import
com.yonde.dex.container.folder.plugin.common.entity.DxObjFolderVOHolder
;
import
com.yonde.dcs.plan.common.vo.ExtStandardAndDocLinkVO
;
import
com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOEmbeddable
;
import
com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOEmbeddable
;
import
com.yonde.dex.version.plugin.common.entity.DxIterationVOHolder
;
import
com.yonde.dex.version.plugin.common.entity.DxIterationVOHolder
;
/**
/**
* @description: ExtStandard-VO
* @description: ExtStandard-VO
* @author: dexadmin
* @author: dexadmin
* @version: V
* @version: V
* @date: 2024-10-25 11:13:36
* @date: 2024-10-30 14:20:45
**/
**/
@JsonTypeInfo
(
use
=
JsonTypeInfo
.
Id
.
CLASS
,
property
=
"dxClassname"
,
visible
=
true
,
defaultImpl
=
ExtStandardVO
.
class
)
@JsonTypeInfo
(
use
=
JsonTypeInfo
.
Id
.
CLASS
,
property
=
"dxClassname"
,
visible
=
true
,
defaultImpl
=
ExtStandardVO
.
class
)
@EqualsAndHashCode
(
callSuper
=
true
)
@EqualsAndHashCode
(
callSuper
=
true
)
@Data
@Data
...
@@ -65,6 +67,10 @@ public class ExtStandardVO extends IdOnlyVO implements IdVO ,DxContextVOHolder ,
...
@@ -65,6 +67,10 @@ public class ExtStandardVO extends IdOnlyVO implements IdVO ,DxContextVOHolder ,
public
static
final
String
DX_ID_EMBEDDABLE_PROP_NAME
=
"dxIdEmbeddable"
;
public
static
final
String
DX_ID_EMBEDDABLE_PROP_NAME
=
"dxIdEmbeddable"
;
public
static
final
String
DX_SECRET_EMBEDDABLE_PROP_NAME
=
"dxSecretEmbeddable"
;
public
static
final
String
DX_SECRET_EMBEDDABLE_PROP_NAME
=
"dxSecretEmbeddable"
;
public
static
final
String
DX_ITERATION_EMBEDDABLE_PROP_NAME
=
"dxIterationEmbeddable"
;
public
static
final
String
DX_ITERATION_EMBEDDABLE_PROP_NAME
=
"dxIterationEmbeddable"
;
public
static
final
String
EXT_ORGANIZATION_PROP_NAME
=
"extOrganization"
;
public
static
final
String
EXT_ORGANIZATION_ID_PROP_NAME
=
"extOrganizationId"
;
public
static
final
String
EXT_ORGANIZATION_ID_TYPE_PROP_NAME
=
"extOrganizationIdType"
;
public
static
final
String
EXT_STANDARD_AND_DOC_LINKS_PROP_NAME
=
"extStandardAndDocLinks"
;
public
static
final
String
IMPLEMENTATION_DATE_PROP_NAME
=
"implementationDate"
;
public
static
final
String
IMPLEMENTATION_DATE_PROP_NAME
=
"implementationDate"
;
public
static
final
String
OBSOLETE_DATE_PROP_NAME
=
"obsoleteDate"
;
public
static
final
String
OBSOLETE_DATE_PROP_NAME
=
"obsoleteDate"
;
public
static
final
String
RELEASE_DATE_PROP_NAME
=
"releaseDate"
;
public
static
final
String
RELEASE_DATE_PROP_NAME
=
"releaseDate"
;
...
@@ -124,6 +130,30 @@ public class ExtStandardVO extends IdOnlyVO implements IdVO ,DxContextVOHolder ,
...
@@ -124,6 +130,30 @@ public class ExtStandardVO extends IdOnlyVO implements IdVO ,DxContextVOHolder ,
@JsonIgnore
@JsonIgnore
private
DxIterationVOEmbeddable
<
ExtStandardVO
>
dxIterationEmbeddable
;
private
DxIterationVOEmbeddable
<
ExtStandardVO
>
dxIterationEmbeddable
;
/**
* 组织
*/
@ReferenceProperty
(
baseProperty
=
"extOrganizationId"
)
@VersionProperty
(
curVersion
=
VersionRelationType
.
ITERATION
,
refVersion
=
VersionRelationType
.
NONE
)
private
DxOrganizationVO
extOrganization
;
/**
* 组织
*/
private
Long
extOrganizationId
;
/**
* 组织
*/
private
String
extOrganizationIdType
;
/**
* 标准和文档的关系集合
*/
@RelationProperty
(
refProperty
=
"target"
)
@VersionProperty
(
curVersion
=
VersionRelationType
.
VERSION
,
refVersion
=
VersionRelationType
.
NONE
)
private
List
<
ExtStandardAndDocLinkVO
>
extStandardAndDocLinks
;
/**
/**
* 实施日期
* 实施日期
*/
*/
...
...
dcs-plan-entity/src/main/java/com/yonde/dcs/plan/entity/po/ExtStandard.java
View file @
34040fee
...
@@ -40,11 +40,11 @@ import com.yonde.dex.secretcode.plugin.entities.DxSecretEmbeddable;
...
@@ -40,11 +40,11 @@ import com.yonde.dex.secretcode.plugin.entities.DxSecretEmbeddable;
import
com.yonde.dex.version.plugin.entities.DxIterationEmbeddable
;
import
com.yonde.dex.version.plugin.entities.DxIterationEmbeddable
;
/**
/**
* @description: ExtStandard-PO实体
* @description: ExtStandard-PO实体
* @author: dexadmin
* @author: dexadmin
* @version: V
* @version: V
* @date: 2024-10-25 11:13:36
* @date: 2024-10-30 14:20:45
**/
**/
@Entity
@Entity
@EqualsAndHashCode
(
callSuper
=
true
)
@EqualsAndHashCode
(
callSuper
=
true
)
@NoArgsConstructor
@NoArgsConstructor
...
@@ -94,6 +94,14 @@ public class ExtStandard extends IdOnlyEntity implements DxContextHolder ,DxObjF
...
@@ -94,6 +94,14 @@ public class ExtStandard extends IdOnlyEntity implements DxContextHolder ,DxObjF
@DexEmbedded
()
@DexEmbedded
()
@Embedded
()
@Embedded
()
private
DxIterationEmbeddable
dxIterationEmbeddable
;
private
DxIterationEmbeddable
dxIterationEmbeddable
;
/**
* 组织的id
*/
private
Long
extOrganizationId
;
/**
* 组织的类型
*/
private
String
extOrganizationIdType
;
/**
/**
* 实施日期
* 实施日期
*/
*/
...
...
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