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

Merge branch 'feature/REQ-3300' into feature/REQ-3581

Browse Source 
# Conflicts:
#	visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java
This commit is contained in:
wangli 2025-02-26 17:01:26 +08:00
commit 360557ad25
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/im/ImGroupAddMembersEventHandler.java
View File

@ -87,6 +87,7 @@ public class ImGroupAddMembersEventHandler implements EventHandler, Initializing
notice.setBizEventMappingCode(refreshableConfiguration.getImGroupAddMemberNoticeEventCode());
notice.setBizCode(String.valueOf(visaId));
notice.setBizExtParams(new JSONObject(Maps.of(
"visaId", visaId,
"initiatorName", ownerProfile.getRealName(),
"visaType", StringUtils.isNotBlank(visaType) ? VisaTypeEnum.valueOf(visaType).getDesc() : "",
"topic", group.getName())));

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

@ -638,6 +638,13 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
private static List<VisaBillDto> buildVisaBillDto(VisaChangeTempCreateReq req, ChangeRecord changeRecord) {
return req.getRelationOrderMap().entrySet().stream()
.peek(os -> {
if (VisaBillTypeEnum.TASK.name().equals(os.getKey())) {
os.setValue(os.getValue().stream().filter(o -> StringUtils.hasText(o.getNo())).collect(Collectors.toList()));
} else {
os.setValue(os.getValue().stream().filter(o -> NumberUtil.isPositiveNumber(o.getId())).collect(Collectors.toList()));
}
})
.flatMap(os -> os.getValue().stream()
.map(o -> VisaBillDto.builder()
.visaId(changeRecord.getId())