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

feat: (REQ-3300) ProjectApiGateway冲突修复

Browse Source
This commit is contained in:
xudawei 2025-02-06 17:55:47 +08:00
parent 6023ae8f82
commit 78ccbbc7ca
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/ProjectApiGateway.java → visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/VisaProjectApiGateway.java
View File

@ -21,7 +21,7 @@ import java.util.List;
@Slf4j
@Service
@RequiredArgsConstructor
public class ProjectApiGateway {
public class VisaProjectApiGateway {
private final ProjectApi projectApi;

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

@ -51,7 +51,7 @@ import cn.axzo.nanopart.visa.server.mapper.ChangeRecordDao;
import cn.axzo.nanopart.visa.server.rpc.ApolloConstructionAreaGateway;
import cn.axzo.nanopart.visa.server.rpc.DrawingMajorGateway;
import cn.axzo.nanopart.visa.server.rpc.MsgCenterGateway;
import cn.axzo.nanopart.visa.server.rpc.ProjectApiGateway;
import cn.axzo.nanopart.visa.server.rpc.VisaProjectApiGateway;
import cn.axzo.nanopart.visa.server.rpc.VisaCooperateShipGateway;
import cn.axzo.nanopart.visa.server.rpc.VisaOrganizationalNodeUserGateway;
import cn.axzo.nanopart.visa.server.rpc.VisaProfileGateway;
@ -144,7 +144,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
private ApolloConstructionAreaGateway apolloConstructionAreaGateway;
@Resource
private ProjectApiGateway projectApiGateway;
private VisaProjectApiGateway visaProjectApiGateway;
@Resource
private VisaCooperateShipGateway visaCooperateShipGateway;
@ -317,7 +317,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
.collect(Collectors.groupingBy(ChangeRecordBill::getBillType
, Collectors.mapping(item -> Objects.equals(0L, item.getBillId()) ? item.getBillNo() : item.getBillId().toString(), Collectors.toList())));
ProjectDetailRes projectDetailRes = projectApiGateway.getProjectById(visa.getRelationProject());
ProjectDetailRes projectDetailRes = visaProjectApiGateway.getProjectById(visa.getRelationProject());
GetDetailRes workspace = workspaceGateway.getById(visa.getRelationWorkspaceId());
@ -776,7 +776,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
}
/*获取工程信息*/
List<Long> projectIdList = records.stream().map(ChangeRecord::getRelationProject).distinct().collect(Collectors.toList());
List<ProjectBriefResp> projectBriefByIds = projectApiGateway.getProjectBriefByIds(projectIdList);
List<ProjectBriefResp> projectBriefByIds = visaProjectApiGateway.getProjectBriefByIds(projectIdList);
AssertUtil.notEmpty(projectBriefByIds, "工程信息获取失败");
// Map<projectId,name>
Map<Long, String> projectIdNameMap = projectBriefByIds.stream().collect(Collectors.toMap(ProjectBriefResp::getId, ProjectBriefResp::getName));
@ -887,7 +887,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
AssertUtil.isTrue(Objects.isNull(visaRecord) || !Objects.equals(visaRecord.getRelationWorkspaceId(), req.getRelationWorkspaceId()), "已存在相同单号的变更签证单据，请修改");
// 发生区域存在性 TODO
// 工程存在性
ProjectDetailRes projectById = projectApiGateway.getProjectById(req.getRelationProject());
ProjectDetailRes projectById = visaProjectApiGateway.getProjectById(req.getRelationProject());
AssertUtil.notNull(projectById, "工程不存在");
AssertUtil.isTrue(Objects.equals(projectById.getWorkspaceInfo().getWorkspaceId(), req.getRelationWorkspaceId()), "工程所属项目与关联项目不匹配");
// 提出时间合法性