feat:(feature/REQ-3581) visaRelation增加id查询条件
This commit is contained in:
parent
d8a20a094c
commit
057dab9188
@ -33,4 +33,6 @@ public class VisaRelationReq {
|
|||||||
* 可为空,则查询所有关联的数据
|
* 可为空,则查询所有关联的数据
|
||||||
*/
|
*/
|
||||||
private VisaRelationFieldEnum fieldEnum;
|
private VisaRelationFieldEnum fieldEnum;
|
||||||
|
|
||||||
|
private Long id;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -37,6 +37,7 @@ public class ChangeRecordRelationController implements ChangeRecordRelationApi {
|
|||||||
return ApiResult.ok(changeRecordRelationService.findByCondition(VisaRelationDto.builder()
|
return ApiResult.ok(changeRecordRelationService.findByCondition(VisaRelationDto.builder()
|
||||||
.visaId(req.getVisaId())
|
.visaId(req.getVisaId())
|
||||||
.varName(Objects.nonNull(req.getFieldEnum()) ? req.getFieldEnum().name() : null)
|
.varName(Objects.nonNull(req.getFieldEnum()) ? req.getFieldEnum().name() : null)
|
||||||
|
.id(req.getId())
|
||||||
.build())
|
.build())
|
||||||
.stream().sorted(Comparator.comparing(ChangeRecordRelation::getCreateAt))
|
.stream().sorted(Comparator.comparing(ChangeRecordRelation::getCreateAt))
|
||||||
.map(i -> VisaRelationResp.builder()
|
.map(i -> VisaRelationResp.builder()
|
||||||
|
|||||||
@ -43,4 +43,5 @@ public class VisaRelationDto {
|
|||||||
*/
|
*/
|
||||||
private Long createBy;
|
private Long createBy;
|
||||||
|
|
||||||
|
private Long id;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -150,7 +150,9 @@ public class ChangeRecordRelationServiceImpl extends ServiceImpl<ChangeRecordRel
|
|||||||
.eq(StringUtils.hasText(dto.getContent()), ChangeRecordRelation::getContent, dto.getContent())
|
.eq(StringUtils.hasText(dto.getContent()), ChangeRecordRelation::getContent, dto.getContent())
|
||||||
.eq(StringUtils.hasText(dto.getContentExt()), ChangeRecordRelation::getContentExt, dto.getContentExt())
|
.eq(StringUtils.hasText(dto.getContentExt()), ChangeRecordRelation::getContentExt, dto.getContentExt())
|
||||||
.eq(Objects.nonNull(dto.getCreateBy()), ChangeRecordRelation::getCreateBy, dto.getCreateBy())
|
.eq(Objects.nonNull(dto.getCreateBy()), ChangeRecordRelation::getCreateBy, dto.getCreateBy())
|
||||||
.eq(ChangeRecordRelation::getIsDelete, 0).list();
|
.eq(ChangeRecordRelation::getIsDelete, 0)
|
||||||
|
.eq(Objects.nonNull(dto.getId()), ChangeRecordRelation::getId, dto.getId())
|
||||||
|
.list();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user