fix：设备周报取值问题

server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderDayReportWeekServiceImpl.java

@@ -9,6 +9,7 @@ import com.makeit.entity.platform.elder.*;
 import com.makeit.enums.platform.alarm.PlatAlarmConfigEnum;
 import com.makeit.enums.platform.alarm.PlatAlarmConfigEnum;
 import com.makeit.enums.report.SleepTypeEnum;
 import com.makeit.enums.report.SleepTypeEnum;
 import com.makeit.module.iot.vo.analysis.EvaluateReportVO;
 import com.makeit.module.iot.vo.analysis.EvaluateReportVO;
+import com.makeit.service.platform.device.PlatDeviceService;
 import com.makeit.service.platform.elder.*;
 import com.makeit.service.platform.elder.*;
 import com.makeit.service.saas.SaasDiseaseReportService;
 import com.makeit.service.saas.SaasDiseaseReportService;
 import com.makeit.service.saas.SaasElderReportConfigService;
 import com.makeit.service.saas.SaasElderReportConfigService;
@@ -71,6 +72,8 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
     private PlatElderSleepAnalysisService platElderSleepAnalysisService;
     private PlatElderSleepAnalysisService platElderSleepAnalysisService;
     @Autowired
     @Autowired
     private PlatElderService platElderService;
     private PlatElderService platElderService;
+    @Autowired
+    private PlatDeviceService platDeviceService;
 
 
     private LocalDateTime weekStartDateTime(LocalDateTime defaultTime) {
     private LocalDateTime weekStartDateTime(LocalDateTime defaultTime) {
         return weekStartDateTime(LocalDate.now().minusDays(1), defaultTime);
         return weekStartDateTime(LocalDate.now().minusDays(1), defaultTime);
@@ -408,7 +411,14 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
         PlatDevice platDevice = platElderRealTimeService.getBreathDevice(platElderIdDTO.getElderId(), platElderIdDTO.getDeviceId());
         PlatDevice platDevice = platElderRealTimeService.getBreathDevice(platElderIdDTO.getElderId(), platElderIdDTO.getDeviceId());
 
 
         if (platDevice != null) {
         if (platDevice != null) {
-            deviceId = platDevice.getId();
+            if (!platDevice.getTenantId().equals(platElderIdDTO.getTenantId())) {
+                platDevice = platDeviceService.getOne(new QueryWrapper<PlatDevice>().lambda()
+                                .eq(BaseBusEntity::getTenantId,platElderIdDTO.getTenantId())
+                        .eq(PlatDevice::getOriDeviceId, platElderIdDTO.getDeviceId()).last("limit 1"));
+                deviceId = platDevice.getId();
+            } else {
+                deviceId = platDevice.getId();
+            }
             //oriDeviceId = platDevice.getOriDeviceId();
             //oriDeviceId = platDevice.getOriDeviceId();
         }
         }
 
 

server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderReportMonthServiceImpl.java

@@ -2,6 +2,7 @@ package com.makeit.service.platform.elder.impl;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.makeit.common.entity.BaseBusEntity;
 import com.makeit.dto.platform.elder.PlatElderReportDTO;
 import com.makeit.dto.platform.elder.PlatElderReportDTO;
 import com.makeit.entity.platform.elder.PlatElderReportMonth;
 import com.makeit.entity.platform.elder.PlatElderReportMonth;
 import com.makeit.mapper.platform.elder.PlatElderReportMonthMapper;
 import com.makeit.mapper.platform.elder.PlatElderReportMonthMapper;
@@ -97,6 +98,7 @@ public class PlatElderReportMonthServiceImpl extends ServiceImpl<PlatElderReport
                 .eq(StringUtils.isNotBlank(platElderIdDTO.getDeviceId()), PlatElderReportMonth::getBreatheOriDeviceId, platElderIdDTO.getDeviceId())
                 .eq(StringUtils.isNotBlank(platElderIdDTO.getDeviceId()), PlatElderReportMonth::getBreatheOriDeviceId, platElderIdDTO.getDeviceId())
                 .ge(PlatElderReportMonth::getDay, start)
                 .ge(PlatElderReportMonth::getDay, start)
                 .le(PlatElderReportMonth::getDay, end)
                 .le(PlatElderReportMonth::getDay, end)
+                .eq(StringUtils.isNotEmpty(platElderIdDTO.getTenantId()), BaseBusEntity::getTenantId,platElderIdDTO.getTenantId())
                 .orderByAsc(PlatElderReportMonth::getDay)
                 .orderByAsc(PlatElderReportMonth::getDay)
         );
         );