1432-新增删除工单的功能
This commit is contained in:
parent
37a96bcccd
commit
e7f64aa551
|
|
@ -33,6 +33,7 @@ public class FileUploadRecordServiceImpl extends ServiceImpl<FileUploadRecordMap
|
||||||
if (Objects.nonNull(endTime)) {
|
if (Objects.nonNull(endTime)) {
|
||||||
endTime = endTime.plusDays(1);
|
endTime = endTime.plusDays(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
Page<FileUploadRecord> datas = lambdaQuery()
|
Page<FileUploadRecord> datas = lambdaQuery()
|
||||||
.eq(Objects.nonNull(request.getSource()), FileUploadRecord::getSource, request.getSource())
|
.eq(Objects.nonNull(request.getSource()), FileUploadRecord::getSource, request.getSource())
|
||||||
.eq(Objects.nonNull(request.getSourceId()), FileUploadRecord::getSourceId, request.getSourceId())
|
.eq(Objects.nonNull(request.getSourceId()), FileUploadRecord::getSourceId, request.getSourceId())
|
||||||
|
|
@ -43,6 +44,12 @@ public class FileUploadRecordServiceImpl extends ServiceImpl<FileUploadRecordMap
|
||||||
.like(FileUploadRecord::getSourceId, request.getKey()))
|
.like(FileUploadRecord::getSourceId, request.getKey()))
|
||||||
.ge(Objects.nonNull(request.getStartTime()), FileUploadRecord::getCreateTime, request.getStartTime())
|
.ge(Objects.nonNull(request.getStartTime()), FileUploadRecord::getCreateTime, request.getStartTime())
|
||||||
.lt(Objects.nonNull(endTime), FileUploadRecord::getCreateTime, endTime)
|
.lt(Objects.nonNull(endTime), FileUploadRecord::getCreateTime, endTime)
|
||||||
|
.and(wq -> wq
|
||||||
|
.apply("source != 0 " +
|
||||||
|
"OR source_id = 0 " +
|
||||||
|
"OR EXISTS (SELECT 1 FROM ticket t WHERE t.id = source_id AND t.is_delete = 0) " +
|
||||||
|
"OR EXISTS (SELECT 1 FROM gongfu_ticket gt WHERE gt.id = source_id AND gt.is_delete = 0)")
|
||||||
|
)
|
||||||
.orderByDesc(FileUploadRecord::getId)
|
.orderByDesc(FileUploadRecord::getId)
|
||||||
.page(new Page<>(request.getPage(), request.getPageSize()));
|
.page(new Page<>(request.getPage(), request.getPageSize()));
|
||||||
return PageUtil.convert(datas, d -> Convert.convert(FileVO.class, d));
|
return PageUtil.convert(datas, d -> Convert.convert(FileVO.class, d));
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue