reviewFeedBack 和reviewSummary 的 VO PO替换

inet-doc-expand-common/src/main/java/com/inet/dcs/document/common/vo/ExtReviewFeedbackVO.java

@@ -55,7 +55,7 @@ import com.yonde.dex.version.plugin.common.entity.DxIterationVOHolder;
 * @description: ExtReviewFeedback-VO
 * @author: dexadmin
 * @version: V
-* @date: 2024-11-7 9:15:12
+* @date: 2024-11-8 10:29:45
 **/
 @JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtReviewFeedbackVO.class)
 @EqualsAndHashCode(callSuper = true)
@@ -73,9 +73,7 @@ public class ExtReviewFeedbackVO extends IdOnlyVO implements DxIterationVOHolder
     public static final String EXT_DESIGN_REVIEW_FEEDBACK_LINKS_PROP_NAME = "extDesignReviewFeedbackLinks";
     public static final String EXT_REVIEW_FEED_DOCUMENT_LINKS_PROP_NAME = "extReviewFeedDocumentLinks";
     public static final String EXT_REVIEW_MINUTES_FEEDBACK_LINKS_PROP_NAME = "extReviewMInutesFeedbackLinks";
-    public static final String EXT_REVIEW_SUMMARY_PROP_NAME = "extReviewSummary";
-    public static final String EXT_REVIEW_SUMMARY_ID_PROP_NAME = "extReviewSummaryId";
-    public static final String EXT_REVIEW_SUMMARY_ID_TYPE_PROP_NAME = "extReviewSummaryIdType";
+    public static final String EXT_REVIEW_SUMMARYS_PROP_NAME = "extReviewSummarys";
     public static final String IS_HAND_OPINION_PROP_NAME = "isHandOpinion";
     public static final String OPINION_REPLY_PROP_NAME = "opinionReply";
     public static final String PLAN_COMPLATE_TIME_PROP_NAME = "planComplateTime";
@@ -161,21 +159,11 @@ public class ExtReviewFeedbackVO extends IdOnlyVO implements DxIterationVOHolder
     private List<ExtReviewMInutesFeedbackLinkVO> extReviewMInutesFeedbackLinks;
 
     /**
-    * 专家意见汇总表
+    * 专家意见汇总表集合
     */
-    @ReferenceProperty(baseProperty = "extReviewSummaryId")
-    @VersionProperty(curVersion = VersionRelationType.ITERATION, refVersion = VersionRelationType.NONE)
-    private ExtReviewSummaryVO extReviewSummary;
-
-    /**
-    * 专家意见汇总表
-    */
-    private Long extReviewSummaryId;
-
-    /**
-    * 专家意见汇总表
-    */
-    private String extReviewSummaryIdType;
+    @RelationProperty(refProperty = "extReviewFeedbacks")
+    @VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.NONE)
+    private List<ExtReviewSummaryVO> extReviewSummarys;
 
     /**
     * 是否手填意见

inet-doc-expand-common/src/main/java/com/inet/dcs/document/common/vo/ExtReviewSummaryVO.java

@@ -40,7 +40,7 @@ import com.yonde.dex.basedata.entity.users.DxUserVO;
 * @description: ExtReviewSummary-VO
 * @author: dexadmin
 * @version: V
-* @date: 2024-11-7 9:15:14
+* @date: 2024-11-8 10:29:47
 **/
 @JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtReviewSummaryVO.class)
 @EqualsAndHashCode(callSuper = true)
@@ -55,6 +55,8 @@ public class ExtReviewSummaryVO extends IdOnlyVO implements IdVO{
     public static final String EXPERT_ID_TYPE_PROP_NAME = "expertIdType";
     public static final String EXPERT_OPINION_PROP_NAME = "expertOpinion";
     public static final String EXT_REVIEW_FEEDBACKS_PROP_NAME = "extReviewFeedbacks";
+    public static final String EXT_REVIEW_FEEDBACKS_ID_PROP_NAME = "extReviewFeedbacksId";
+    public static final String EXT_REVIEW_FEEDBACKS_ID_TYPE_PROP_NAME = "extReviewFeedbacksIdType";
     public static final String OPINION_NOTE_PROP_NAME = "opinionNote";
     public static final String REPLY_PROP_NAME = "reply";
     public static final String REPLY_ID_PROP_NAME = "replyId";
@@ -96,11 +98,21 @@ public class ExtReviewSummaryVO extends IdOnlyVO implements IdVO{
     private String expertOpinion;
 
     /**
-    * 评审意见反馈集合
+    * 评审意见反馈
     */
-    @RelationProperty(refProperty = "extReviewSummary")
+    @ReferenceProperty(baseProperty = "extReviewFeedbacksId")
     @VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.ITERATION)
-    private List<ExtReviewFeedbackVO> extReviewFeedbacks;
+    private ExtReviewFeedbackVO extReviewFeedbacks;
+
+    /**
+    * 评审意见反馈
+    */
+    private Long extReviewFeedbacksId;
+
+    /**
+    * 评审意见反馈
+    */
+    private String extReviewFeedbacksIdType;
 
     /**
     * 备注

inet-doc-expand-entity/src/main/java/com/inet/dcs/document/entity/po/ExtReviewFeedback.java

@@ -43,7 +43,7 @@ import com.yonde.dex.version.plugin.entities.DxIterationEmbeddable;
 * @description: ExtReviewFeedback-PO实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-11-7 9:15:12
+* @date: 2024-11-8 10:29:45
 **/
 @Entity
 @EqualsAndHashCode(callSuper = true)
@@ -95,14 +95,6 @@ public class ExtReviewFeedback extends IdOnlyEntity implements DxContextHolder ,
     @Embedded()
     private DxSecretEmbeddable dxSecretEmbeddable;
     /**
-    * 专家意见汇总表的id
-    */
-    private Long extReviewSummaryId;
-    /**
-    * 专家意见汇总表的类型
-    */
-    private String extReviewSummaryIdType;
-    /**
     * 是否手填意见
     */
     private Boolean isHandOpinion;

inet-doc-expand-entity/src/main/java/com/inet/dcs/document/entity/po/ExtReviewSummary.java

@@ -31,7 +31,7 @@ import com.yonde.dex.dao.entity.base.IdOnlyEntity;
 * @description: ExtReviewSummary-PO实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-11-7 9:15:14
+* @date: 2024-11-8 10:29:47
 **/
 @Entity
 @EqualsAndHashCode(callSuper = true)
@@ -63,6 +63,14 @@ public class ExtReviewSummary extends IdOnlyEntity implements IdEntity{
     */
     private String expertOpinion;
     /**
+    * 评审意见反馈的id
+    */
+    private Long extReviewFeedbacksId;
+    /**
+    * 评审意见反馈的类型
+    */
+    private String extReviewFeedbacksIdType;
+    /**
     * 备注
     */
     private String opinionNote;