Skip to content

D
dcs-doc-expand
Commit 701f9841 authored by wangqiang's avatar wangqiang
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 2334fe33 455e3e63
Expand all Show whitespace changes
Inline Side-by-side
Showing with 490 additions and 59 deletions
dcs-doc-expand-core/src/main/java/com/yonde/dcs/core/factory/DENUtils.java
View file @ 701f9841
......@@ -144,8 +144,7 @@ public class DENUtils {
List<ExtRelatedDenLinkVO> sourceRelatedDenLink = null;
if (StringUtils.isEmpty(v.getId())) {
//新增
// TODO: 2024/8/15 getSourceRelatedDenLink不存在
// sourceRelatedDenLink = v.getSourceRelatedDenLink();
sourceRelatedDenLink = v.getDxDocumentExpand().getSourceExtRelatedDenLink();
} else {
//修改
//查询CAA附件
......@@ -153,8 +152,7 @@ public class DENUtils {
if (ObjectUtils.isEmpty(docOpenProps)) {
return null;
}
// TODO: 2024/8/15 getSourceRelatedDenLink不存在
// sourceRelatedDenLink = docOpenProps.getSourceRelatedDenLink();
sourceRelatedDenLink = docOpenProps.getDxDocumentExpand().getSourceExtRelatedDenLink();
}
List<DxDocumentVO> denTarget = new ArrayList<>();
......
dcs-doc-expand-core/src/main/java/com/yonde/dcs/core/factory/NCRUtils.java
View file @ 701f9841
......@@ -82,15 +82,13 @@ public class NCRUtils {
//新增
if (!ObjectUtils.isEmpty(v)) {
//相关图号
// TODO: 2024/8/15 getSourceRelatedDrawingLink属性不存在
// List<ExtRelatedDrawingLinkVO> sourceRelatedDrawingLink = v.getSourceRelatedDrawingLink();
List<ExtRelatedDrawingLinkVO> sourceRelatedDrawingLink = v.getDxDocumentExpand().getSourceExtRelatedDrawingLink();
//相关技术标准
// TODO: 2024/8/15 getSourceTechStandardLink属性不存在
// List<ExtTechStandardLinkVO> sourceTechStandardLink = v.getSourceTechStandardLink();
List<ExtTechStandardLinkVO> sourceTechStandardLink = v.getDxDocumentExpand().getSourceExtTechStandardLink();
//获取图号 docNumber
// jsonObject.put("docNumber", CollectionUtils.isEmpty(sourceRelatedDrawingLink) ? "" : sourceRelatedDrawingLink.get(0).getDocNumber());
jsonObject.put("docNumber", CollectionUtils.isEmpty(sourceRelatedDrawingLink) ? "" : sourceRelatedDrawingLink.get(0).getDocNumber());
// 相应技术标准 techStandard
// jsonObject.put("techStandard", CollectionUtils.isEmpty(sourceTechStandardLink) ? "" : sourceTechStandardLink.get(0).getDocNumber());
jsonObject.put("techStandard", CollectionUtils.isEmpty(sourceTechStandardLink) ? "" : sourceTechStandardLink.get(0).getDocNumber());
}
//纠正措施附件 inspectAttach
List<ObjFileLinkVO> objFileLinks = v.getObjFileLinks();
......@@ -114,15 +112,13 @@ public class NCRUtils {
DxDocumentVO docOpenProps = this.findDocOpenProps(v.getId());
if (!ObjectUtils.isEmpty(docOpenProps)) {
//相关图号
// TODO: 2024/8/15 getSourceRelatedDrawingLink属性不存在
// List<ExtRelatedDrawingLinkVO> sourceRelatedDrawingLink = docOpenProps.getSourceRelatedDrawingLink();
List<ExtRelatedDrawingLinkVO> sourceRelatedDrawingLink = docOpenProps.getDxDocumentExpand().getSourceExtRelatedDrawingLink();
//相关技术标准
// TODO: 2024/8/15 getSourceTechStandardLink属性不存在
// List<ExtTechStandardLinkVO> sourceTechStandardLink = docOpenProps.getSourceTechStandardLink();
List<ExtTechStandardLinkVO> sourceTechStandardLink = docOpenProps.getDxDocumentExpand().getSourceExtTechStandardLink();
//获取图号 docNumber
// jsonObject.put("docNumber", CollectionUtils.isEmpty(sourceRelatedDrawingLink) ? "" : sourceRelatedDrawingLink.get(0).getDocNumber());
jsonObject.put("docNumber", CollectionUtils.isEmpty(sourceRelatedDrawingLink) ? "" : sourceRelatedDrawingLink.get(0).getDocNumber());
// 相应技术标准 techStandard
// jsonObject.put("techStandard", CollectionUtils.isEmpty(sourceTechStandardLink) ? "" : sourceTechStandardLink.get(0).getDocNumber());
jsonObject.put("techStandard", CollectionUtils.isEmpty(sourceTechStandardLink) ? "" : sourceTechStandardLink.get(0).getDocNumber());
}
//纠正措施附件 inspectAttach
List<ObjFileLinkVO> objFileLinks = docOpenProps.getObjFileLinks();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment