wangli/nanopart
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(REQ-3300): 适配VisaChangeTempCreateReq模型调整

Browse Source
This commit is contained in:
chenwenjian 2025-02-06 15:45:57 +08:00
parent a0750551d1
commit 6ed96dd26d
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java
View File

@ -898,18 +898,17 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
});
}
// 相关单位及人员存在性
if (CollectionUtils.isNotEmpty(req.getRelationUnitAndPersonList())) {
List<VisaChangeTempCreateReq.RelationUnitAndPerson> team = req.getRelationUnitAndPersonList().stream()
.filter(r -> {
AssertUtil.notNull(r.getType(), "相关单位类型错误");
AssertUtil.isTrue(NumberUtil.isPositiveNumber(r.getOuId()), "请选择" + r.getType().getDesc());
AssertUtil.isTrue(NumberUtil.isPositiveNumber(r.getNodeId()), "请选择" + r.getType().getDesc());
AssertUtil.notEmpty(r.getPersonId(), "请选择" + r.getType().getDesc() + "确认人");
AssertUtil.isTrue(r.getPersonId().size() <= verifyPersonLimit, String.format(r.getType().getDesc() + "确认人，最多支持{}个", verifyPersonLimit));
return Objects.equals(SaasCooperateShipCooperateTypeEnum.PROJ_TEAM, r.getType());
})
.collect(Collectors.toList());
List<VisaChangeTempCreateReq.RelationUnitAndPerson> unit = req.getRelationUnitAndPersonList();
// if (CollectionUtils.isNotEmpty(req.getRelationUnitAndPersonList())) {
// List<VisaChangeTempCreateReq.RelationUnitAndPerson> team = req.getRelationUnitAndPersonList().stream()
// .filter(r -> {
// AssertUtil.notNull(r.getType(), "相关单位类型错误");
// AssertUtil.isTrue(NumberUtil.isPositiveNumber(r.getOuId()), "请选择" + r.getType().getDesc());
// AssertUtil.isTrue(NumberUtil.isPositiveNumber(r.getNodeId()), "请选择" + r.getType().getDesc());
//// AssertUtil.isTrue(r.getPersonId().size() <= verifyPersonLimit, String.format(r.getType().getDesc() + "确认人，最多支持{}个", verifyPersonLimit));
// return Objects.equals(SaasCooperateShipCooperateTypeEnum.PROJ_TEAM, r.getType());
// })
// .collect(Collectors.toList());
// List<VisaChangeTempCreateReq.RelationUnitAndPerson> unit = req.getRelationUnitAndPersonList();
// if (CollectionUtils.isNotEmpty(team)) {
// // 去除班组
// List<Long> teamNodeId = team.stream().map(VisaChangeTempCreateReq.RelationUnitAndPerson::getOuIdOrTeamNodeId).distinct().collect(Collectors.toList());