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

Merge remote-tracking branch 'origin/feature/REQ-3581' into feature/REQ-3581

Browse Source
This commit is contained in:
yanglin 2025-03-04 17:52:35 +08:00
commit 20d11b6646
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java
View File

@ -98,6 +98,8 @@ import java.util.Objects;
import java.util.Optional;
import java.util.stream.Collectors;
import static cn.axzo.maokai.common.enums.SaasCooperateShipCooperateTypeEnum.PROJ_GROUP;
import static cn.axzo.maokai.common.enums.SaasCooperateShipCooperateTypeEnum.PROJ_TEAM;
import static cn.axzo.nanopart.visa.api.constant.VisaConstant.FORM_FIELD_ATTACH;
import static cn.axzo.nanopart.visa.api.constant.VisaConstant.IM_GROUP_BIZ_INFO_VISA_ID;
import static cn.axzo.nanopart.visa.api.constant.VisaConstant.IM_GROUP_BIZ_INFO_VISA_TYPE;
@ -616,10 +618,12 @@ public class ChangeRecordRelationServiceImpl extends ServiceImpl<ChangeRecordRel
}
private Map<Long, String> listCooperateShipTypes(VisaRequestStampReq req, ChangeRecord visa) {
return visaCooperateShipGateway.genericQuery(CooperateShipQueryReq.builder()
List<CooperateShipResp> cooperateShipResps = visaCooperateShipGateway.genericQuery(CooperateShipQueryReq.builder()
.workspaceId(visa.getRelationWorkspaceId())
.excludeCooperateTypes(Lists.newArrayList(PROJ_TEAM.getCode(), PROJ_GROUP.getCode()))
.ouIdList(req.getRequestStamps().stream().map(VisaRequestStampReq.RequestStampModel::getOuId).distinct().collect(Collectors.toList()))
.build()).stream().collect(Collectors.toMap(CooperateShipResp::getOrganizationalUnitId, i -> SaasCooperateShipCooperateTypeEnum.getByCode(i.getCooperateType()).name()));
.build());
return cooperateShipResps.stream().collect(Collectors.toMap(CooperateShipResp::getOrganizationalUnitId, i -> SaasCooperateShipCooperateTypeEnum.getByCode(i.getCooperateType()).name()));
}
private Map<String, String> createContract(VisaRequestStampReq req, ChangeRecord visa) {