diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenDataServiceImpl.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenDataServiceImpl.java index c1e908f..725b7ef 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenDataServiceImpl.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenDataServiceImpl.java @@ -25,6 +25,7 @@ import com.renkang.emergency.largeScreen.entity.vo.HealthArchivesVO; import com.renkang.emergency.largeScreen.entity.vo.TodayEmergencyVO; import com.renkang.emergency.largeScreen.mapper.LargeScreenDataMapper; import com.renkang.emergency.largeScreen.service.ILargeScreenDataService; +import com.renkang.emergency.mapper.OrderMapper; import com.renkang.emergency.mapper.TblUserHelpMapper; import com.renkang.emergency.service.IResourceService; import com.renkang.emergency.service.ITbQimoNoticeService; @@ -66,6 +67,7 @@ public class LargeScreenDataServiceImpl extends ServiceImpl list){ - - List userHelpList = userHelpMapper.selectList( - new LambdaQueryWrapper().between(TblUserHelp::getHelpTime, startDate, endDate).in(TblUserHelp::getType,Arrays.asList("0","1"))); - if (userHelpList != null && !userHelpList.isEmpty()) { - List userIdList = userHelpList.stream().map(TblUserHelp::getUserId).distinct().collect(Collectors.toList()); + List orderList = orderMapper.selectList( + new LambdaQueryWrapper().between(Order::getCreateTime, startDate, endDate).in(Order::getInitiatorType,Arrays.asList("0","1"))); + if (orderList != null && !orderList.isEmpty()) { + List userIdList = orderList.stream().map(Order::getInitiatorUserId).distinct().collect(Collectors.toList()); List userList = sysBaseAPI.listUserByIdsNew(userIdList); // 根据用户id分组 Map userMap = userList.stream() .collect(Collectors.toMap(LoginUser::getId, a -> a, (k1, k2) -> k1)); - for (TblUserHelp tblUserHelp : userHelpList) { + for (Order order : orderList) { TodayEmergencyVO vo = new TodayEmergencyVO(); - vo.setUserId(tblUserHelp.getUserId()); - if (tblUserHelp.getType().equals("0")){ + vo.setUserId(order.getInitiatorUserId()); + if (order.getInitiatorType().equals("0")){ vo.setEmergencyType("0"); } - if (tblUserHelp.getType().equals("1")){ + if (order.getInitiatorType().equals("1")){ vo.setEmergencyType("1"); } - vo.setPhone(tblUserHelp.getOutMobile()); - LoginUser user = userMap.get(tblUserHelp.getUserId()); + vo.setPhone(order.getInitiatorUserMobile()); + LoginUser user = userMap.get(order.getInitiatorUserId()); if (user != null) { vo.setRealName(user.getRealname()); vo.setSex(user.getSex()); @@ -777,14 +778,14 @@ public class LargeScreenDataServiceImpl extends ServiceImpl , MPJBaseMapper { /** * 操作人员当天值班记录