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 09:58:31 +08:00
parent 92d80654a7
commit 51f1e42a4b
3 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/response/VisaChangePageSearchResp.java
View File

@ -124,4 +124,11 @@ public class VisaChangePageSearchResp {
return type.getDesc();
}
public String getStatusDesc() {
if (Objects.isNull(status)) {
return null;
}
return status.getDesc();
}
}

1
visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordConfirmServiceImpl.java
View File

@ -41,7 +41,6 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors;
/**

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

@ -804,8 +804,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
private LambdaQueryChainWrapper<ChangeRecord> getFilter(VisaChangePageSearchReq filter) {
Set<Long> visaList = changeRecordConfirmService.permissionVisaData("", filter.getCurrentPersonId(), filter.getCurrentWorkspaceId(), filter.getCurrentOuId());
return lambdaQuery()
LambdaQueryChainWrapper<ChangeRecord> queryChainWrapper = lambdaQuery()
.in(ChangeRecord::getId, visaList)
.eq(NumberUtil.isPositiveNumber(filter.getWorkspaceId()), ChangeRecord::getRelationWorkspaceId, filter.getWorkspaceId())
.eq(Objects.nonNull(filter.getType()), ChangeRecord::getType, filter.getType())
@ -814,11 +813,18 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
.eq(NumberUtil.isPositiveNumber(filter.getProjectId()), ChangeRecord::getRelationProject, filter.getProjectId())
.in(CollectionUtils.isNotEmpty(filter.getInitiators()), ChangeRecord::getCreateBy, filter.getInitiators())
.in(CollectionUtils.isNotEmpty(filter.getStatuses()), ChangeRecord::getStatus, filter.getStatuses())
.between(CollectionUtils.isNotEmpty(filter.getAmountChange()), ChangeRecord::getAmountChange, filter.getAmountChange().get(0), filter.getAmountChange().get(1))
.between(CollectionUtils.isNotEmpty(filter.getHappenTime()), ChangeRecord::getHappenTime, filter.getHappenTime().get(0), filter.getHappenTime().get(1))
.between(CollectionUtils.isNotEmpty(filter.getApproveCompletedDate()), ChangeRecord::getApprovalCompleteTime, filter.getApproveCompletedDate().get(0), filter.getApproveCompletedDate().get(1))
.eq(CollectionUtils.isNotEmpty(filter.getApproveCompletedDate()), ChangeRecord::getStatus, VisaStatusEnum.COMPLETED)
.orderByDesc(ChangeRecord::getId);
if (CollectionUtils.isNotEmpty(filter.getAmountChange())) {
queryChainWrapper.between(ChangeRecord::getAmountChange, filter.getAmountChange().get(0), filter.getAmountChange().get(1));
}
if (CollectionUtils.isNotEmpty(filter.getHappenTime())) {
queryChainWrapper.between(ChangeRecord::getHappenTime, filter.getHappenTime().get(0), filter.getHappenTime().get(1));
}
if (CollectionUtils.isNotEmpty(filter.getApproveCompletedDate())) {
queryChainWrapper.between(ChangeRecord::getApprovalCompleteTime, filter.getApproveCompletedDate().get(0), filter.getApproveCompletedDate().get(1));
queryChainWrapper.eq(ChangeRecord::getStatus, VisaStatusEnum.COMPLETED);
}
return queryChainWrapper;
}
@ -826,6 +832,9 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
OrgNodeUserBriefInfoListReq nodeUserReq = OrgNodeUserBriefInfoListReq.builder()
.workspaceId(workspaceId)
.personIds(initiatorPersonIds)
.needJob(true)
.needNode(true)
.needUnit(true)
.build();
List<OrgNodeUserBriefInfoResp> nodeUserResp = nodeUserGateway.listOrgNodeUsers(nodeUserReq);
if (CollectionUtils.isEmpty(nodeUserResp)) {
@ -903,7 +912,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
// 发起人
resp.setInitiator(buildInitiatorResp(initiatorMap, visaIdInitiatorMap.get(r.getId())));
// 是否被其他单据关联
resp.setIsRelated(Objects.nonNull(billMainMap) && Objects.nonNull(billMainMap.get(r.getId())));
resp.setIsRelated(req.getNeedRelatedBill() ? Objects.nonNull(billMainMap) && Objects.nonNull(billMainMap.get(r.getId())) : null);
return resp;
})
.collect(Collectors.toList());