wkc/ccdi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
wkc
2026-03-13 09:56:37 +08:00
parent e36f13b6b5
commit 54b81191aa
4 changed files with 60 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

45
ccdi-info-collection/src/test/java/com/ruoyi/info/collection/service/CcdiStaffFmyRelationAssetAggregationTest.java Normal file
View File

@@ -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());
}
}