diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java index c89906eb0d..ad2c35ec1c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java @@ -114,15 +114,23 @@ public class EpmetUserServiceImpl implements EpmetUserService { List staffPatrolList = staffPatrolRecordDao.selectPatrolList(formDTO); //5.封装数据 + Map map = new HashMap<>(); result.forEach(re -> { staffPatrolList.forEach(st -> { if (re.getGridId().equals(st.getGridId()) && re.getStaffId().equals(st.getStaffId())) { re.setPatrolStartTime(st.getPatrolStartTime()); re.setPatrolTotal(st.getPatrolTotal()); re.setStatus(st.getStatus()); + map.put(re.getGridId()+re.getStaffId(),re.getStaffId()); } }); }); + //可能存在的在a网格有记录后在a网格将该人员移除 + staffPatrolList.forEach(st->{ + if(!map.containsKey(st.getGridId()+st.getStaffId())){ + result.add(st); + } + }); //6.按条件排序 Collections.sort(result, new Comparator() { @Override