Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dcs-doc-expand
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-doc-expand
Commits
455e3e63
Commit
455e3e63
authored
Aug 23, 2024
by
pchxue
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
迁移问题处理
parent
3c6d0655
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
490 additions
and
59 deletions
+490
-59
DxDocumentVOExpand.java
.../yonde/dcs/document/expand/entity/DxDocumentVOExpand.java
+480
-43
DENUtils.java
...re/src/main/java/com/yonde/dcs/core/factory/DENUtils.java
+2
-4
NCRUtils.java
...re/src/main/java/com/yonde/dcs/core/factory/NCRUtils.java
+8
-12
No files found.
dcs-doc-expand-common/src/main/java/com/yonde/dcs/document/expand/entity/DxDocumentVOExpand.java
View file @
455e3e63
This diff is collapsed.
Click to expand it.
dcs-doc-expand-core/src/main/java/com/yonde/dcs/core/factory/DENUtils.java
View file @
455e3e63
...
@@ -144,8 +144,7 @@ public class DENUtils {
...
@@ -144,8 +144,7 @@ public class DENUtils {
List
<
ExtRelatedDenLinkVO
>
sourceRelatedDenLink
=
null
;
List
<
ExtRelatedDenLinkVO
>
sourceRelatedDenLink
=
null
;
if
(
StringUtils
.
isEmpty
(
v
.
getId
()))
{
if
(
StringUtils
.
isEmpty
(
v
.
getId
()))
{
//新增
//新增
// TODO: 2024/8/15 getSourceRelatedDenLink不存在
sourceRelatedDenLink
=
v
.
getDxDocumentExpand
().
getSourceExtRelatedDenLink
();
// sourceRelatedDenLink = v.getSourceRelatedDenLink();
}
else
{
}
else
{
//修改
//修改
//查询CAA附件
//查询CAA附件
...
@@ -153,8 +152,7 @@ public class DENUtils {
...
@@ -153,8 +152,7 @@ public class DENUtils {
if
(
ObjectUtils
.
isEmpty
(
docOpenProps
))
{
if
(
ObjectUtils
.
isEmpty
(
docOpenProps
))
{
return
null
;
return
null
;
}
}
// TODO: 2024/8/15 getSourceRelatedDenLink不存在
sourceRelatedDenLink
=
docOpenProps
.
getDxDocumentExpand
().
getSourceExtRelatedDenLink
();
// sourceRelatedDenLink = docOpenProps.getSourceRelatedDenLink();
}
}
List
<
DxDocumentVO
>
denTarget
=
new
ArrayList
<>();
List
<
DxDocumentVO
>
denTarget
=
new
ArrayList
<>();
...
...
dcs-doc-expand-core/src/main/java/com/yonde/dcs/core/factory/NCRUtils.java
View file @
455e3e63
...
@@ -82,15 +82,13 @@ public class NCRUtils {
...
@@ -82,15 +82,13 @@ public class NCRUtils {
//新增
//新增
if
(!
ObjectUtils
.
isEmpty
(
v
))
{
if
(!
ObjectUtils
.
isEmpty
(
v
))
{
//相关图号
//相关图号
// TODO: 2024/8/15 getSourceRelatedDrawingLink属性不存在
List
<
ExtRelatedDrawingLinkVO
>
sourceRelatedDrawingLink
=
v
.
getDxDocumentExpand
().
getSourceExtRelatedDrawingLink
();
// List<ExtRelatedDrawingLinkVO> sourceRelatedDrawingLink = v.getSourceRelatedDrawingLink();
//相关技术标准
//相关技术标准
// TODO: 2024/8/15 getSourceTechStandardLink属性不存在
List
<
ExtTechStandardLinkVO
>
sourceTechStandardLink
=
v
.
getDxDocumentExpand
().
getSourceExtTechStandardLink
();
// List<ExtTechStandardLinkVO> sourceTechStandardLink = v.getSourceTechStandardLink();
//获取图号 docNumber
//获取图号 docNumber
//
jsonObject.put("docNumber", CollectionUtils.isEmpty(sourceRelatedDrawingLink) ? "" : sourceRelatedDrawingLink.get(0).getDocNumber());
jsonObject
.
put
(
"docNumber"
,
CollectionUtils
.
isEmpty
(
sourceRelatedDrawingLink
)
?
""
:
sourceRelatedDrawingLink
.
get
(
0
).
getDocNumber
());
// 相应技术标准 techStandard
// 相应技术标准 techStandard
//
jsonObject.put("techStandard", CollectionUtils.isEmpty(sourceTechStandardLink) ? "" : sourceTechStandardLink.get(0).getDocNumber());
jsonObject
.
put
(
"techStandard"
,
CollectionUtils
.
isEmpty
(
sourceTechStandardLink
)
?
""
:
sourceTechStandardLink
.
get
(
0
).
getDocNumber
());
}
}
//纠正措施附件 inspectAttach
//纠正措施附件 inspectAttach
List
<
ObjFileLinkVO
>
objFileLinks
=
v
.
getObjFileLinks
();
List
<
ObjFileLinkVO
>
objFileLinks
=
v
.
getObjFileLinks
();
...
@@ -114,15 +112,13 @@ public class NCRUtils {
...
@@ -114,15 +112,13 @@ public class NCRUtils {
DxDocumentVO
docOpenProps
=
this
.
findDocOpenProps
(
v
.
getId
());
DxDocumentVO
docOpenProps
=
this
.
findDocOpenProps
(
v
.
getId
());
if
(!
ObjectUtils
.
isEmpty
(
docOpenProps
))
{
if
(!
ObjectUtils
.
isEmpty
(
docOpenProps
))
{
//相关图号
//相关图号
// TODO: 2024/8/15 getSourceRelatedDrawingLink属性不存在
List
<
ExtRelatedDrawingLinkVO
>
sourceRelatedDrawingLink
=
docOpenProps
.
getDxDocumentExpand
().
getSourceExtRelatedDrawingLink
();
// List<ExtRelatedDrawingLinkVO> sourceRelatedDrawingLink = docOpenProps.getSourceRelatedDrawingLink();
//相关技术标准
//相关技术标准
// TODO: 2024/8/15 getSourceTechStandardLink属性不存在
List
<
ExtTechStandardLinkVO
>
sourceTechStandardLink
=
docOpenProps
.
getDxDocumentExpand
().
getSourceExtTechStandardLink
();
// List<ExtTechStandardLinkVO> sourceTechStandardLink = docOpenProps.getSourceTechStandardLink();
//获取图号 docNumber
//获取图号 docNumber
//
jsonObject.put("docNumber", CollectionUtils.isEmpty(sourceRelatedDrawingLink) ? "" : sourceRelatedDrawingLink.get(0).getDocNumber());
jsonObject
.
put
(
"docNumber"
,
CollectionUtils
.
isEmpty
(
sourceRelatedDrawingLink
)
?
""
:
sourceRelatedDrawingLink
.
get
(
0
).
getDocNumber
());
// 相应技术标准 techStandard
// 相应技术标准 techStandard
//
jsonObject.put("techStandard", CollectionUtils.isEmpty(sourceTechStandardLink) ? "" : sourceTechStandardLink.get(0).getDocNumber());
jsonObject
.
put
(
"techStandard"
,
CollectionUtils
.
isEmpty
(
sourceTechStandardLink
)
?
""
:
sourceTechStandardLink
.
get
(
0
).
getDocNumber
());
}
}
//纠正措施附件 inspectAttach
//纠正措施附件 inspectAttach
List
<
ObjFileLinkVO
>
objFileLinks
=
docOpenProps
.
getObjFileLinks
();
List
<
ObjFileLinkVO
>
objFileLinks
=
docOpenProps
.
getObjFileLinks
();
...
...
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