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
Hide whitespace changes
Inline Side-by-side
Showing with 490 additions and 59 deletions
dcs-doc-expand-common/src/main/java/com/yonde/dcs/document/expand/entity/DxDocumentVOExpand.java
View file @ 701f9841
......@@ -15,13 +15,42 @@ import cn.hutool.core.convert.Convert;
import cn.hutool.core.lang.TypeReference;
import java.util.List;
import com.yonde.dcs.document.expand.plugin.DxDocumentVOPluginExpand;
import com.yonde.dcs.common.vo.ExtDenDescriptLinkVO;
import com.yonde.dcs.common.vo.ExtObsoleteDocLinkVO;
import com.yonde.dcs.common.vo.ExtCheckedFileLinkVO;
import com.yonde.dcs.common.vo.ExtInterfaceInfoLinkVO;
import com.yonde.dcs.common.vo.ExtApplyDocVO;
import com.yonde.dcs.common.vo.ExtRelatedDcrLinkVO;
import com.yonde.dcs.common.vo.ExtInterfaceDocLinkVO;
import com.yonde.dcs.common.vo.ExtReviewChangeLinkVO;
import com.yonde.dcs.common.vo.ExtReplenishLinkVO;
import com.yonde.dcs.common.vo.ExtSendFormLinkVO;
import com.yonde.dcs.common.vo.ExtReviewDocComLinkVO;
import com.yonde.dcs.common.vo.ExtAtlasDrawingLinkVO;
import com.yonde.dcs.common.vo.ExtReplyDocVO;
import com.yonde.dcs.common.vo.ExtReviewDocLinkVO;
import com.yonde.dcs.common.vo.ExtRefContractDocVO;
import com.yonde.dcs.common.vo.ExtTechStandardLinkVO;
import com.yonde.dcs.common.vo.ExtInterfaceReplaceLinkVO;
import com.yonde.dcs.common.vo.ExtRelatedDenLinkVO;
import com.yonde.dcs.common.vo.ExtObjectDocLinkVO;
import com.yonde.dcs.common.vo.ExtRefDesignInputLinkVO;
import com.yonde.dcs.common.vo.ExtChangeReasonLinkVO;
import com.yonde.dcs.common.vo.ExtComDocLinkVO;
import com.yonde.dcs.common.vo.ExtAuditRecordCardLinkVO;
import com.yonde.dcs.common.vo.ExtRefOutsideDocVO;
import com.yonde.dcs.common.vo.ExtRelatedNcrLinkVO;
import com.yonde.dcs.common.vo.ExtDocumentReferentLinkVO;
import com.yonde.dcs.common.vo.ExtRefJobContractDocVO;
import com.yonde.dcs.common.vo.ExtRelatedDrawingLinkVO;
import com.yonde.dcs.common.vo.ExtRelatedInterfaceLinkVO;
/**
* @description: DxDocument-VOExpand扩展实体
* @author: dexadmin
* @version: V
* @date: 2024-8-2 15:26:32
**/
* @description: DxDocument-VOExpand扩展实体
* @author: dexadmin
* @version: V
* @date: 2024-8-23 9:38:30
**/
@EqualsAndHashCode
@Data
@ToString(callSuper = true)
......@@ -30,6 +59,13 @@ public class DxDocumentVOExpand<V extends DxDocumentVOPluginExpand> implements S
public static final String CHECK_CONTENT_PROP_NAME = "checkContent";
public static final String CHECK_STANDARD_REVIEW_PROP_NAME = "checkStandardReview";
public static final String DRAWING_CODE_PROP_NAME = "drawingCode";
public static final String EXT_AUDIT_RECORD_CARD_LINKS_PROP_NAME = "extAuditRecordCardLinks";
public static final String EXT_COM_DOC_LINKS_PROP_NAME = "extComDocLinks";
public static final String EXT_INTERFACE_DOC_LINKS_PROP_NAME = "extInterfaceDocLinks";
public static final String EXT_INTERFACE_INFO_LINKS_PROP_NAME = "extInterfaceInfoLinks";
public static final String EXT_OBJECT_DOC_LINKS_PROP_NAME = "extObjectDocLinks";
public static final String EXT_REVIEW_CHANGE_LINKS_PROP_NAME = "extReviewChangeLinks";
public static final String EXT_REVIEW_DOC_COM_LINKS_PROP_NAME = "extReviewDocComLinks";
public static final String FIVE_LEV_CATEGORY_PROP_NAME = "fiveLevCategory";
public static final String FOUR_LEV_CATEGORY_PROP_NAME = "fourLevCategory";
public static final String ONE_LEV_CATEGORY_PROP_NAME = "oneLevCategory";
......@@ -40,105 +76,506 @@ public class DxDocumentVOExpand<V extends DxDocumentVOPluginExpand> implements S
public static final String PROJECT_TYPE_PROP_NAME = "projectType";
public static final String REVIEW_CONTENT_PROP_NAME = "reviewContent";
public static final String REVIEW_CONTENT_STANDARD_PROP_NAME = "reviewContentStandard";
public static final String SOURCE_EXT_APPLY_DOC_PROP_NAME = "sourceExtApplyDoc";
public static final String SOURCE_EXT_ATLAS_DRAWING_LINK_PROP_NAME = "sourceExtAtlasDrawingLink";
public static final String SOURCE_EXT_CHANGE_REASON_LINK_PROP_NAME = "sourceExtChangeReasonLink";
public static final String SOURCE_EXT_CHECKED_FILE_LINK_PROP_NAME = "sourceExtCheckedFileLink";
public static final String SOURCE_EXT_DEN_DESCRIPT_LINK_PROP_NAME = "sourceExtDenDescriptLink";
public static final String SOURCE_EXT_DOCUMENT_REFERENT_LINK_PROP_NAME = "sourceExtDocumentReferentLink";
public static final String SOURCE_EXT_INTERFACE_REPLACE_LINK_PROP_NAME = "sourceExtInterfaceReplaceLink";
public static final String SOURCE_EXT_OBSOLETE_DOC_LINK_PROP_NAME = "sourceExtObsoleteDocLink";
public static final String SOURCE_EXT_REF_CONTRACT_DOC_PROP_NAME = "sourceExtRefContractDoc";
public static final String SOURCE_EXT_REF_DESIGN_INPUT_LINK_PROP_NAME = "sourceExtRefDesignInputLink";
public static final String SOURCE_EXT_REF_JOB_CONTRACT_DOC_PROP_NAME = "sourceExtRefJobContractDoc";
public static final String SOURCE_EXT_REF_OUTSIDE_DOC_PROP_NAME = "sourceExtRefOutsideDoc";
public static final String SOURCE_EXT_RELATED_DCR_LINK_PROP_NAME = "sourceExtRelatedDcrLink";
public static final String SOURCE_EXT_RELATED_DEN_LINK_PROP_NAME = "sourceExtRelatedDenLink";
public static final String SOURCE_EXT_RELATED_DRAWING_LINK_PROP_NAME = "sourceExtRelatedDrawingLink";
public static final String SOURCE_EXT_RELATED_INTERFACE_LINK_PROP_NAME = "sourceExtRelatedInterfaceLink";
public static final String SOURCE_EXT_RELATED_NCR_LINK_PROP_NAME = "sourceExtRelatedNcrLink";
public static final String SOURCE_EXT_REPLENISH_LINK_PROP_NAME = "sourceExtReplenishLink";
public static final String SOURCE_EXT_REPLY_DOC_PROP_NAME = "sourceExtReplyDoc";
public static final String SOURCE_EXT_REVIEW_DOC_LINK_PROP_NAME = "sourceExtReviewDocLink";
public static final String SOURCE_EXT_SEND_FORM_LINK_PROP_NAME = "sourceExtSendFormLink";
public static final String SOURCE_EXT_TECH_STANDARD_LINK_PROP_NAME = "sourceExtTechStandardLink";
public static final String SUB_SYSTEM_PROP_NAME = "subSystem";
public static final String SUBJECT_PROP_NAME = "subject";
public static final String TARGET_EXT_APPLY_DOC_PROP_NAME = "targetExtApplyDoc";
public static final String TARGET_EXT_ATLAS_DRAWING_LINK_PROP_NAME = "targetExtAtlasDrawingLink";
public static final String TARGET_EXT_CHANGE_REASON_LINK_PROP_NAME = "targetExtChangeReasonLink";
public static final String TARGET_EXT_CHECKED_FILE_LINK_PROP_NAME = "targetExtCheckedFileLink";
public static final String TARGET_EXT_DEN_DESCRIPT_LINK_PROP_NAME = "targetExtDenDescriptLink";
public static final String TARGET_EXT_DOCUMENT_REFERENT_LINK_PROP_NAME = "targetExtDocumentReferentLink";
public static final String TARGET_EXT_INTERFACE_REPLACE_LINK_PROP_NAME = "targetExtInterfaceReplaceLink";
public static final String TARGET_EXT_OBSOLETE_DOC_LINK_PROP_NAME = "targetExtObsoleteDocLink";
public static final String TARGET_EXT_REF_CONTRACT_DOC_PROP_NAME = "targetExtRefContractDoc";
public static final String TARGET_EXT_REF_DESIGN_INPUT_LINK_PROP_NAME = "targetExtRefDesignInputLink";
public static final String TARGET_EXT_REF_JOB_CONTRACT_DOC_PROP_NAME = "targetExtRefJobContractDoc";
public static final String TARGET_EXT_REF_OUTSIDE_DOC_PROP_NAME = "targetExtRefOutsideDoc";
public static final String TARGET_EXT_RELATED_DCR_LINK_PROP_NAME = "targetExtRelatedDcrLink";
public static final String TARGET_EXT_RELATED_DEN_LINK_PROP_NAME = "targetExtRelatedDenLink";
public static final String TARGET_EXT_RELATED_DRAWING_LINK_PROP_NAME = "targetExtRelatedDrawingLink";
public static final String TARGET_EXT_RELATED_INTERFACE_LINK_PROP_NAME = "targetExtRelatedInterfaceLink";
public static final String TARGET_EXT_RELATED_NCR_LINK_PROP_NAME = "targetExtRelatedNcrLink";
public static final String TARGET_EXT_REPLENISH_LINK_PROP_NAME = "targetExtReplenishLink";
public static final String TARGET_EXT_REPLY_DOC_PROP_NAME = "targetExtReplyDoc";
public static final String TARGET_EXT_REVIEW_DOC_LINK_PROP_NAME = "targetExtReviewDocLink";
public static final String TARGET_EXT_SEND_FORM_LINK_PROP_NAME = "targetExtSendFormLink";
public static final String TARGET_EXT_TECH_STANDARD_LINK_PROP_NAME = "targetExtTechStandardLink";
public static final String THREE_LEV_CATEGORY_PROP_NAME = "threeLevCategory";
public static final String TWO_LEV_CATEGORY_PROP_NAME = "twoLevCategory";
public static final String VERIFY_CONTENT_PROP_NAME = "verifyContent";
/**
* 附件页数
*/
* 附件页数
*/
private String attachPages;
/**
* 校核内容
*/
* 校核内容
*/
private String checkContent;
/**
* 校核节点的标准化审查内容
*/
* 校核节点的标准化审查内容
*/
private String checkStandardReview;
/**
* 图纸编码
*/
* 图纸编码
*/
private String drawingCode;
/**
* 五级分类
*/
* 校审记录卡Link模型集合
*/
@RelationProperty(refProperty = "source")
@VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
private List<ExtAuditRecordCardLinkVO> extAuditRecordCardLinks;
/**
* 专家意见升版文档关联模型集合
*/
@RelationProperty(refProperty = "target")
@VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
private List<ExtComDocLinkVO> extComDocLinks;
/**
* 接口单文档link集合
*/
@RelationProperty(refProperty = "target")
@VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
private List<ExtInterfaceDocLinkVO> extInterfaceDocLinks;
/**
* 接口提资Link模型集合
*/
@RelationProperty(refProperty = "source")
@VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
private List<ExtInterfaceInfoLinkVO> extInterfaceInfoLinks;
/**
* 签审对象文档link集合
*/
@RelationProperty(refProperty = "target")
@VersionProperty(curVersion = VersionRelationType.MASTER, refVersion = VersionRelationType.NONE)
private List<ExtObjectDocLinkVO> extObjectDocLinks;
/**
* 设计变更申请审查Link模型集合
*/
@RelationProperty(refProperty = "source")
@VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
private List<ExtReviewChangeLinkVO> extReviewChangeLinks;
/**
* 评审文件专家意见关联模型集合
*/
@RelationProperty(refProperty = "source")
@VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
private List<ExtReviewDocComLinkVO> extReviewDocComLinks;
/**
* 五级分类
*/
private String fiveLevCategory;
/**
* 四级分类
*/
* 四级分类
*/
private String fourLevCategory;
/**
* 一级分类
*/
* 一级分类
*/
private String oneLevCategory;
/**
* 所属子分系统
*/
* 所属子分系统
*/
private String ownSubSystem;
/**
* 所属设备
*/
* 所属设备
*/
private String ownedEquipment;
/**
* 阶段状态
*/
* 阶段状态
*/
private String phaseState;
/**
* 项目代号
*/
* 项目代号
*/
private String projectCode;
/**
* 项目类型
*/
* 项目类型
*/
private String projectType;
/**
* 审核内容
*/
* 审核内容
*/
private String reviewContent;
/**
* 审核内容的标准化审查内容
*/
* 审核内容的标准化审查内容
*/
private String reviewContentStandard;
/**
* 所属分系统
*/
* 相关申请数据/单据集合
*/
@RelationProperty(refProperty = "source")
@VersionProperty(curVersion = VersionRelationType.MASTER, refVersion = VersionRelationType.NONE)
private List<ExtApplyDocVO> sourceExtApplyDoc;
/**
* 图册图纸关联模型集合
*/
@RelationProperty(refProperty = "source")
@VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
private List<ExtAtlasDrawingLinkVO> sourceExtAtlasDrawingLink;
/**
* 变更原因相关文档集合
*/
@RelationProperty(refProperty = "source")
@VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
private List<ExtChangeReasonLinkVO> sourceExtChangeReasonLink;
/**
* 被查文件Link集合
*/
@RelationProperty(refProperty = "source")
@VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
private List<ExtCheckedFileLinkVO> sourceExtCheckedFileLink;
/**
* 澄清事项描述相关文档集合
*/
@RelationProperty(refProperty = "source")
@VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
private List<ExtDenDescriptLinkVO> sourceExtDenDescriptLink;
/**
* 相关文档集合
*/
@RelationProperty(refProperty = "source")
@VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
private List<ExtDocumentReferentLinkVO> sourceExtDocumentReferentLink;
/**
* 接口替换单Link模型集合
*/
@RelationProperty(refProperty = "source")
@VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
private List<ExtInterfaceReplaceLinkVO> sourceExtInterfaceReplaceLink;
/**
* 过时文件通知单Link集合
*/
@RelationProperty(refProperty = "source")
@VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
private List<ExtObsoleteDocLinkVO> sourceExtObsoleteDocLink;
/**
* ExtRefContractDoc集合
*/
@RelationProperty(refProperty = "source")
@VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
private List<ExtRefContractDocVO> sourceExtRefContractDoc;
/**
* 相关设计输入单Link模型集合
*/
@RelationProperty(refProperty = "source")
@VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
private List<ExtRefDesignInputLinkVO> sourceExtRefDesignInputLink;
/**
* 相关工作联系单集合
*/
@RelationProperty(refProperty = "source")
@VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
private List<ExtRefJobContractDocVO> sourceExtRefJobContractDoc;
/**
* 相关外部收文集合
*/
@RelationProperty(refProperty = "source")
@VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
private List<ExtRefOutsideDocVO> sourceExtRefOutsideDoc;
/**
* 相关DCR集合
*/
@RelationProperty(refProperty = "source")
@VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
private List<ExtRelatedDcrLinkVO> sourceExtRelatedDcrLink;
/**
* 相关DEN集合
*/
@RelationProperty(refProperty = "source")
@VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
private List<ExtRelatedDenLinkVO> sourceExtRelatedDenLink;
/**
* 关联图纸图号集合
*/
@RelationProperty(refProperty = "source")
@VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
private List<ExtRelatedDrawingLinkVO> sourceExtRelatedDrawingLink;
/**
* 相关接口单Link集合
*/
@RelationProperty(refProperty = "source")
@VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
private List<ExtRelatedInterfaceLinkVO> sourceExtRelatedInterfaceLink;
/**
* 不符合项处理单Link模型集合
*/
@RelationProperty(refProperty = "source")
@VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
private List<ExtRelatedNcrLinkVO> sourceExtRelatedNcrLink;
/**
* 接口补充单Link模型集合
*/
@RelationProperty(refProperty = "source")
@VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
private List<ExtReplenishLinkVO> sourceExtReplenishLink;
/**
* 相关答复提资数据/单据集合
*/
@RelationProperty(refProperty = "source")
@VersionProperty(curVersion = VersionRelationType.MASTER, refVersion = VersionRelationType.NONE)
private List<ExtReplyDocVO> sourceExtReplyDoc;
/**
* 主审设计数据集合
*/
@RelationProperty(refProperty = "source")
@VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
private List<ExtReviewDocLinkVO> sourceExtReviewDocLink;
/**
* 对外发送申请单Link模型集合
*/
@RelationProperty(refProperty = "source")
@VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
private List<ExtSendFormLinkVO> sourceExtSendFormLink;
/**
* 相应技术标准集合
*/
@RelationProperty(refProperty = "source")
@VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
private List<ExtTechStandardLinkVO> sourceExtTechStandardLink;
/**
* 所属分系统
*/
private String subSystem;
/**
* 所属课题
*/
* 所属课题
*/
private String subject;
/**
* 三级分类
*/
* 相关申请数据/单据集合
*/
@RelationProperty(refProperty = "target")
@VersionProperty(curVersion = VersionRelationType.MASTER, refVersion = VersionRelationType.NONE)
private List<ExtApplyDocVO> targetExtApplyDoc;
/**
* 图册图纸关联模型集合
*/
@RelationProperty(refProperty = "target")
@VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
private List<ExtAtlasDrawingLinkVO> targetExtAtlasDrawingLink;
/**
* 变更原因相关文档集合
*/
@RelationProperty(refProperty = "target")
@VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
private List<ExtChangeReasonLinkVO> targetExtChangeReasonLink;
/**
* 被查文件Link集合
*/
@RelationProperty(refProperty = "target")
@VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
private List<ExtCheckedFileLinkVO> targetExtCheckedFileLink;
/**
* 澄清事项描述相关文档集合
*/
@RelationProperty(refProperty = "target")
@VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
private List<ExtDenDescriptLinkVO> targetExtDenDescriptLink;
/**
* 相关文档集合
*/
@RelationProperty(refProperty = "target")
@VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
private List<ExtDocumentReferentLinkVO> targetExtDocumentReferentLink;
/**
* 接口替换单Link模型集合
*/
@RelationProperty(refProperty = "target")
@VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
private List<ExtInterfaceReplaceLinkVO> targetExtInterfaceReplaceLink;
/**
* 过时文件通知单Link集合
*/
@RelationProperty(refProperty = "target")
@VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
private List<ExtObsoleteDocLinkVO> targetExtObsoleteDocLink;
/**
* ExtRefContractDoc集合
*/
@RelationProperty(refProperty = "target")
@VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
private List<ExtRefContractDocVO> targetExtRefContractDoc;
/**
* 相关设计输入单Link模型集合
*/
@RelationProperty(refProperty = "target")
@VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
private List<ExtRefDesignInputLinkVO> targetExtRefDesignInputLink;
/**
* 相关工作联系单集合
*/
@RelationProperty(refProperty = "target")
@VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
private List<ExtRefJobContractDocVO> targetExtRefJobContractDoc;
/**
* 相关外部收文集合
*/
@RelationProperty(refProperty = "target")
@VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
private List<ExtRefOutsideDocVO> targetExtRefOutsideDoc;
/**
* 相关DCR集合
*/
@RelationProperty(refProperty = "target")
@VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
private List<ExtRelatedDcrLinkVO> targetExtRelatedDcrLink;
/**
* 相关DEN集合
*/
@RelationProperty(refProperty = "target")
@VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
private List<ExtRelatedDenLinkVO> targetExtRelatedDenLink;
/**
* 关联图纸图号集合
*/
@RelationProperty(refProperty = "target")
@VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
private List<ExtRelatedDrawingLinkVO> targetExtRelatedDrawingLink;
/**
* 相关接口单Link集合
*/
@RelationProperty(refProperty = "target")
@VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
private List<ExtRelatedInterfaceLinkVO> targetExtRelatedInterfaceLink;
/**
* 不符合项处理单Link模型集合
*/
@RelationProperty(refProperty = "target")
@VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
private List<ExtRelatedNcrLinkVO> targetExtRelatedNcrLink;
/**
* 接口补充单Link模型集合
*/
@RelationProperty(refProperty = "target")
@VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
private List<ExtReplenishLinkVO> targetExtReplenishLink;
/**
* 相关答复提资数据/单据集合
*/
@RelationProperty(refProperty = "target")
@VersionProperty(curVersion = VersionRelationType.MASTER, refVersion = VersionRelationType.NONE)
private List<ExtReplyDocVO> targetExtReplyDoc;
/**
* 主审设计数据集合
*/
@RelationProperty(refProperty = "target")
@VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
private List<ExtReviewDocLinkVO> targetExtReviewDocLink;
/**
* 对外发送申请单Link模型集合
*/
@RelationProperty(refProperty = "target")
@VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
private List<ExtSendFormLinkVO> targetExtSendFormLink;
/**
* 相应技术标准集合
*/
@RelationProperty(refProperty = "target")
@VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
private List<ExtTechStandardLinkVO> targetExtTechStandardLink;
/**
* 三级分类
*/
private String threeLevCategory;
/**
* 二级分类
*/
* 二级分类
*/
private String twoLevCategory;
/**
* 审定内容
*/
* 审定内容
*/
private String verifyContent;
}
......
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