admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

工作票null修复

Browse Source
This commit is contained in:
guoshengxiong 2025-10-09 17:55:50 +08:00
parent d1f2ac63be
commit a9955d50b5
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/zhgd/xmgl/modules/policecamera/service/impl/WorkTicketServiceImpl.java
View File

@ -117,9 +117,17 @@ public class WorkTicketServiceImpl extends ServiceImpl<WorkTicketMapper, WorkTic
Map<Long, EnterpriseInfo> enterpriseMap = enterpriseInfoService.getEnterpriseMapByProjectSn(projectSn);
List<Long> ticketIds = list.stream().map(WorkTicketVo::getId).collect(Collectors.toList());
Map<Long, PoliceCameraItem> policeCameraItemMap = policeCameraItemService.getItemMapByProjectSn(projectSn);
Map<Long, List<PoliceCameraItem>> ticketMap = workTicketCameraRelService.list(new LambdaQueryWrapper<WorkTicketCameraRel>()
.in(WorkTicketCameraRel::getWorkTicketId, ticketIds)).stream().collect(Collectors.groupingBy(WorkTicketCameraRel::getWorkTicketId,
Collectors.mapping(o -> policeCameraItemMap.get(o.getPoliceCameraId()), Collectors.toList())));
Map<Long, List<PoliceCameraItem>> ticketMap = workTicketCameraRelService.list(
new LambdaQueryWrapper<WorkTicketCameraRel>()
.in(WorkTicketCameraRel::getWorkTicketId, ticketIds))
.stream()
.collect(Collectors.groupingBy(
WorkTicketCameraRel::getWorkTicketId,
Collectors.mapping(
o -> policeCameraItemMap.get(o.getPoliceCameraId()),
CollUtils.filteringNull()
)
));
for (WorkTicketVo ticketVo : list) {
// 设置申请人名称
ticketVo.setApplicantNames(EntityUtils.convertIdsToNames(

18
src/main/java/com/zhgd/xmgl/util/CollUtils.java Normal file
View File

@ -0,0 +1,18 @@
package com.zhgd.xmgl.util;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collector;
import java.util.stream.Collectors;
public class CollUtils {
/**
* 过滤掉null值的收集器
*/
public static <T> Collector<T, ?, List<T>> filteringNull() {
return Collectors.collectingAndThen(
Collectors.toList(),
list -> list.stream().filter(Objects::nonNull).collect(Collectors.toList())
);
}
}