扩展亲属关系聚合资产字段

ccdi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiStaffFmyRelationAddDTO.java

@@ -10,6 +10,7 @@ import lombok.Data;
 import java.io.Serial;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 员工亲属关系新增DTO
@@ -116,4 +117,8 @@ public class CcdiStaffFmyRelationAddDTO implements Serializable {
     /** 备注 */
     @Schema(description = "备注")
     private String remark;
+
+    /** 亲属资产列表 */
+    @Schema(description = "亲属资产列表")
+    private List<CcdiAssetInfoDTO> assetInfoList;
 }

ccdi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiStaffFmyRelationEditDTO.java

@@ -11,6 +11,7 @@ import lombok.Data;
 import java.io.Serial;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 员工亲属关系编辑DTO
@@ -122,4 +123,8 @@ public class CcdiStaffFmyRelationEditDTO implements Serializable {
     /** 备注 */
     @Schema(description = "备注")
     private String remark;
+
+    /** 亲属资产列表 */
+    @Schema(description = "亲属资产列表")
+    private List<CcdiAssetInfoDTO> assetInfoList;
 }

ccdi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CcdiStaffFmyRelationVO.java

@@ -7,6 +7,7 @@ import lombok.Data;
 import java.io.Serial;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 员工亲属关系VO
@@ -141,4 +142,8 @@ public class CcdiStaffFmyRelationVO implements Serializable {
     /** 更新人 */
     @Schema(description = "更新人")
     private String updatedBy;
+
+    /** 亲属资产列表 */
+    @Schema(description = "亲属资产列表")
+    private List<CcdiAssetInfoVO> assetInfoList;
 }

ccdi-info-collection/src/test/java/com/ruoyi/info/collection/service/CcdiStaffFmyRelationAssetAggregationTest.java

@@ -0,0 +1,45 @@
+package com.ruoyi.info.collection.service;
+
+import com.ruoyi.info.collection.domain.dto.CcdiAssetInfoDTO;
+import com.ruoyi.info.collection.domain.dto.CcdiStaffFmyRelationAddDTO;
+import com.ruoyi.info.collection.domain.dto.CcdiStaffFmyRelationEditDTO;
+import com.ruoyi.info.collection.domain.vo.CcdiAssetInfoVO;
+import com.ruoyi.info.collection.domain.vo.CcdiStaffFmyRelationVO;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertSame;
+
+class CcdiStaffFmyRelationAssetAggregationTest {
+
+    @Test
+    void addDto_shouldExposeAssetInfoList() {
+        CcdiStaffFmyRelationAddDTO addDTO = new CcdiStaffFmyRelationAddDTO();
+        List<CcdiAssetInfoDTO> assetInfoList = List.of(new CcdiAssetInfoDTO());
+
+        addDTO.setAssetInfoList(assetInfoList);
+
+        assertSame(assetInfoList, addDTO.getAssetInfoList());
+    }
+
+    @Test
+    void editDto_shouldExposeAssetInfoList() {
+        CcdiStaffFmyRelationEditDTO editDTO = new CcdiStaffFmyRelationEditDTO();
+        List<CcdiAssetInfoDTO> assetInfoList = List.of(new CcdiAssetInfoDTO());
+
+        editDTO.setAssetInfoList(assetInfoList);
+
+        assertSame(assetInfoList, editDTO.getAssetInfoList());
+    }
+
+    @Test
+    void relationVo_shouldExposeAssetInfoList() {
+        CcdiStaffFmyRelationVO relationVO = new CcdiStaffFmyRelationVO();
+        List<CcdiAssetInfoVO> assetInfoList = List.of(new CcdiAssetInfoVO());
+
+        relationVO.setAssetInfoList(assetInfoList);
+
+        assertSame(assetInfoList, relationVO.getAssetInfoList());
+    }
+}