fix：修复bug

server-service/src/main/java/com/makeit/service/platform/device/impl/PlatDeviceServiceImpl.java

@@ -206,7 +206,7 @@ public class PlatDeviceServiceImpl extends ServiceImpl<PlatDeviceMapper, PlatDev
 
 
         if (StringUtils.isNotEmpty(dto.getAttribute())) {
         if (StringUtils.isNotEmpty(dto.getAttribute())) {
             PlatDeviceOther other = platDeviceOtherService.getOne(new QueryWrapper<PlatDeviceOther>().lambda()
             PlatDeviceOther other = platDeviceOtherService.getOne(new QueryWrapper<PlatDeviceOther>().lambda()
-                    .eq(PlatDeviceOther::getDeviceId, db.getId()));
+                    .eq(PlatDeviceOther::getOriDeviceId, db.getOriDeviceId()));
             if (other != null) {
             if (other != null) {
                 other.setAttribute(dto.getAttribute());
                 other.setAttribute(dto.getAttribute());
                 platDeviceOtherService.updateById(other);
                 platDeviceOtherService.updateById(other);
@@ -382,6 +382,13 @@ public class PlatDeviceServiceImpl extends ServiceImpl<PlatDeviceMapper, PlatDev
 
 
         other.setOriDeviceId(db.getOriDeviceId());
         other.setOriDeviceId(db.getOriDeviceId());
         platDeviceOtherService.saveOrUpdate(other);
         platDeviceOtherService.saveOrUpdate(other);
+
+        if (StringUtils.isNotEmpty(dto.getAttribute())) {
+            // 写入设备
+            PlatDeviceAttrWechatDTO platDeviceAttrWechatDTO = JSON.parseObject(dto.getAttribute(), PlatDeviceAttrWechatDTO.class);
+            platDeviceAttrWechatDTO.setDeviceId(db.getOriDeviceId());
+            editDeviceProperties(platDeviceAttrWechatDTO);
+        }
     }
     }
 
 
     /**
     /**

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

@@ -463,6 +463,7 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe
         platDeviceList.forEach(e -> {
         platDeviceList.forEach(e -> {
             List<PlatDayDurationRecord> recordList = platDayDurationRecordService.list(new QueryWrapper<PlatDayDurationRecord>().lambda()
             List<PlatDayDurationRecord> recordList = platDayDurationRecordService.list(new QueryWrapper<PlatDayDurationRecord>().lambda()
                     .eq(PlatDayDurationRecord::getDeviceId, e.getId())
                     .eq(PlatDayDurationRecord::getDeviceId, e.getId())
+                     .eq(StringUtils.isNotEmpty(platElderIdDTO.getElderId()),PlatDayDurationRecord::getElderIds,platElderIdDTO.getElderId())
                     .in(PlatDayDurationRecord::getDay, StreamUtil.map(nowList, dateTimeFormatter::format))
                     .in(PlatDayDurationRecord::getDay, StreamUtil.map(nowList, dateTimeFormatter::format))
             );
             );