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
This commit is contained in:
wangli 2025-02-26 20:24:41 +08:00
commit c69c09a4fa
6 changed files with 7 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/CheckVisaWithVisaIdReq.java
View File

@ -38,10 +38,10 @@ public class CheckVisaWithVisaIdReq {
AssertUtil.notNull(response.getRelationProject(), "关联工程不能为空");
AssertUtil.notEmpty(response.getHappenTime(), "提出时间不能为空");
AssertUtil.notEmpty(response.getReason(), "发生原因不能为空");
AssertUtil.notEmpty(response.getRelationProfessionalList(), "专业不能为空");
// AssertUtil.notEmpty(response.getRelationProfessionalList(), "专业不能为空");
if (CollectionUtils.isNotEmpty(response.getRelationOuAndPersonList())) {
response.getRelationOuAndPersonList().forEach(item -> {
AssertUtil.notEmpty(item.getRelationPersonList(), "专业不能为空");
AssertUtil.notEmpty(item.getRelationPersonList(), "确认人不能为空");
});
}

2
visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/VisaChangeTempCreateReq.java
View File

@ -98,7 +98,7 @@ public class VisaChangeTempCreateReq {
* ]
* </pre>
*/
@NotNull(message = "请选择专业")
// @NotNull(message = "请选择专业")
private JSONArray relationProfessional;
/**

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

@ -91,6 +91,7 @@ public class ImGroupAddMembersEventHandler implements EventHandler, Initializing
"initiatorName", ownerProfile.getRealName(),
"visaType", StringUtils.isNotBlank(visaType) ? VisaTypeEnum.valueOf(visaType).getDesc() : "",
"topic", group.getName())));
notice.setRouterParams(new JSONObject(Maps.of("visaId", visaId)));
noticeApi.send(notice);
}
log.info("receive add member event, push notice success!");

25
visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/DataObjectApiGateway.java
View File

@ -33,35 +33,10 @@ public class DataObjectApiGateway {
ApiResult<MatchDataObjectResp> match = dataObjectApi.match(req);
log.info("DataObjectApiGateway match, result:{}", JSON.toJSONString(match));
return match.getData();
// return mockDataObject();
} catch (Exception e) {
log.warn("DataObjectApiGateway match exception", e);
throw e;
}
}
/**
* mock数据
*/
private MatchDataObjectResp mockDataObject() {
MergeMatchDataResp.DataItem dt1 = MergeMatchDataResp.DataItem.builder()
.personIds(Lists.newArrayList(9000398292L,89511L))
// .ouId(6122L)
// .workspaceId(399L)
// .nodeId(10345L)
// .projectIds(Lists.newArrayList(424L))
.build();
MergeMatchDataResp.DataItem dt2 = MergeMatchDataResp.DataItem.builder()
.personIds(Lists.newArrayList(9000506L,89636L))
// .ouId(6158L)
// .workspaceId(399L)
// .nodeId(10345L)
// .projectIds(Lists.newArrayList(763L))
.build();
MergeMatchDataResp matchDataResp = MergeMatchDataResp.builder().dataItems(Lists.newArrayList(dt1, dt2)).build();
return MatchDataObjectResp.builder().mergedDataObject(matchDataResp).build();
}
}

2
visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordLogServiceImpl.java
View File

@ -298,7 +298,7 @@ public class ChangeRecordLogServiceImpl extends ServiceImpl<ChangeRecordLogDao,
* 构建key
*/
private String buildKey(ChangeRecordLog log) {
return log.getVisaId() + log.getAction() + log.getTitle() + log.getContent();
return log.getVisaId() + log.getAction() + log.getTitle() + log.getContent() + log.getCreateAt().getTime();
}
/**

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

@ -1460,7 +1460,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
.findAny()
.ifPresent(m -> {
log.info("{} bill {} is related by {} visa {}", m.getBillType(), m.getBillId(), m.getVisaType(), m.getVisaId());
throw new ServiceException(String.format("%s：单据%s已被其他单据关联，请重新选择", m.getBillType(), m.getBillNo()));
throw new ServiceException(String.format("%s已被其他%s关联，请重新选择", m.getBillType().getDesc(), visaType.getDesc()));
}));
}
@ -1478,7 +1478,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
.findAny()
.ifPresent(m -> {
log.info("{} bill {} is related by {} visa {}", m.getBillType(), m.getBillId(), m.getVisaType(), m.getVisaId());
throw new ServiceException(String.format("%s：单据%s已被其他单据关联，请重新选择", m.getBillType(), m.getBillNo()));
throw new ServiceException(String.format("%s已被其他%s关联，请重新选择", m.getBillType().getDesc(), visaType.getDesc()));
}));
}