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

feat: (REQ-3300) 变更签证详情-相关单据类型优化

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

6
visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/response/VisaDetailByIdResponse.java
View File

@ -134,17 +134,17 @@ public class VisaDetailByIdResponse {
/**
* 任务单
*/
private List<Long> relationTaskList;
private List<String> relationTaskList;
/**
* 整改单
*/
private List<Long> relationRectifyList;
private List<String> relationRectifyList;
/**
* 变更单
*/
private List<Long> relationVisaList;
private List<String> relationVisaList;
/**
* 状态

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

@ -313,7 +313,9 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
PersonProfileDto profile = visaProfileGateway.getProfile(visa.getCreateBy());
List<ChangeRecordBill> changeRecordBills = changeRecordBillService.listById(visaId);
Map<VisaBillTypeEnum, List<Long>> billMap = changeRecordBills.stream().collect(Collectors.groupingBy(ChangeRecordBill::getBillType, Collectors.mapping(ChangeRecordBill::getBillId, Collectors.toList())));
Map<VisaBillTypeEnum, List<String>> billMap = changeRecordBills.stream()
.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());
GetDetailRes workspace = workspaceGateway.getById(visa.getRelationWorkspaceId());