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:
chenwenjian 2025-02-08 17:28:37 +08:00
parent a83ad7b79b
commit a018e89e85
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,7 +18,9 @@ import cn.axzo.im.center.api.vo.req.GroupDismissRequest;
import cn.axzo.im.center.api.vo.resp.GroupCreateResponse;
import cn.axzo.im.center.common.enums.AppTypeEnum;
import cn.axzo.im.center.common.enums.GroupType;
import cn.axzo.maokai.api.vo.request.CooperateShipQueryReq;
import cn.axzo.maokai.api.vo.request.OrgNodeUserBriefInfoListReq;
import cn.axzo.maokai.api.vo.response.CooperateShipResp;
import cn.axzo.maokai.api.vo.response.OrgNodeUserBriefInfoResp;
import cn.axzo.maokai.common.enums.SaasCooperateShipCooperateTypeEnum;
import cn.axzo.nanopart.visa.api.enums.VisaBillTypeEnum;
@ -57,6 +59,7 @@ 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.OrganizationalUnitGateway;
import cn.axzo.nanopart.visa.server.rpc.VisaCooperateShipGateway;
import cn.axzo.nanopart.visa.server.rpc.VisaOrganizationalNodeUserGateway;
import cn.axzo.nanopart.visa.server.rpc.VisaProfileGateway;
import cn.axzo.nanopart.visa.server.rpc.VisaProjectApiGateway;
@ -197,6 +200,8 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
@Resource
private RefreshableConfiguration refreshableConfiguration;
@Resource
private VisaCooperateShipGateway visaCooperateShipGateway;
/**
* 状态变更
@ -455,6 +460,19 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
@Override
@Transactional(rollbackFor = Exception.class)
public Long tempCreateVisaChangeRecord(VisaChangeTempCreateReq req) {
AssertUtil.isTrue(NumberUtil.isPositiveNumber(req.getRelationWorkspaceId()), "关联项目不能为空");
AssertUtil.isTrue(NumberUtil.isPositiveNumber(req.getOperatorOuId()) && NumberUtil.isPositiveNumber(req.getOperatorPersonId()),
"操作人信息不能为空");
if (NumberUtil.isNotPositiveNumber(req.getOperatorOuType())) {
CooperateShipQueryReq shipQueryReq = CooperateShipQueryReq.builder()
.personId(req.getOperatorPersonId())
.workspaceId(req.getRelationWorkspaceId())
.ouId(req.getOperatorOuId())
.build();
List<CooperateShipResp> shipRespList = visaCooperateShipGateway.genericQuery(shipQueryReq);
AssertUtil.notEmpty(shipRespList, "操作人所在单位信息不能为空");
req.setOperatorOuType(shipRespList.get(0).getCooperateType());
}
ChangeRecord changeRecord;
List<VisaConfirmDto> confirmPerson = Lists.newArrayList();
VisaAddLogContext oldContext = null;
@ -499,9 +517,9 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
/*保存附加关联信息*/
// 相关单位与人员
if (CollectionUtils.isNotEmpty(req.getRelationUnitAndPersonList())) {
confirmPerson = req.getRelationUnitAndPersonList().stream()
confirmPerson.addAll(req.getRelationUnitAndPersonList().stream()
.map(p -> buildConfirmVisaConfirmDto(p, changeRecord, req.getOperatorPersonId()))
.collect(Collectors.toList());
.collect(Collectors.toList()));
}
changeRecordConfirmService.addConfirm(confirmPerson);
// 保存发生内容及说明
@ -800,7 +818,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
// }
/*获取数据*/
changeRecordList = getFilter(filter,Sets.newHashSet()).list();
changeRecordList = getFilter(filter, Sets.newHashSet()).list();
AssertUtil.isTrue(CollUtil.isNotEmpty(changeRecordList), "");
/*数据转换*/
@ -813,7 +831,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
// reportServiceSDK.asyncUploadReportPsw(scene, fileName, null, false, );
}
private LambdaQueryChainWrapper<ChangeRecord> getFilter(VisaChangePageSearchReq filter,Set<Long> permissionVisaIdSet) {
private LambdaQueryChainWrapper<ChangeRecord> getFilter(VisaChangePageSearchReq filter, Set<Long> permissionVisaIdSet) {
LambdaQueryChainWrapper<ChangeRecord> queryChainWrapper = lambdaQuery()
// .in(ChangeRecord::getId, permissionVisaIdSet)