|
@@ -978,7 +978,7 @@ public class IotRdDailyReportServiceImpl implements IotRdDailyReportService {
|
|
|
List<IotProductClassifyDO> allDeviceCategories = iotProductClassifyMapper.selectList(deviceCategoryReqVO);
|
|
List<IotProductClassifyDO> allDeviceCategories = iotProductClassifyMapper.selectList(deviceCategoryReqVO);
|
|
|
if (CollUtil.isNotEmpty(allDeviceCategories)) {
|
|
if (CollUtil.isNotEmpty(allDeviceCategories)) {
|
|
|
allDeviceCategories.forEach(category -> {
|
|
allDeviceCategories.forEach(category -> {
|
|
|
- if ("A".equals(category.getRemark()) || "B".equals(category.getRemark())) {
|
|
|
|
|
|
|
+ if ("A".equals(category.getRemark())) {
|
|
|
abDeviceCategoryIds.add(category.getId());
|
|
abDeviceCategoryIds.add(category.getId());
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
@@ -1324,7 +1324,7 @@ public class IotRdDailyReportServiceImpl implements IotRdDailyReportService {
|
|
|
List<IotProductClassifyDO> allDeviceCategories = iotProductClassifyMapper.selectList(deviceCategoryReqVO);
|
|
List<IotProductClassifyDO> allDeviceCategories = iotProductClassifyMapper.selectList(deviceCategoryReqVO);
|
|
|
if (CollUtil.isNotEmpty(allDeviceCategories)) {
|
|
if (CollUtil.isNotEmpty(allDeviceCategories)) {
|
|
|
allDeviceCategories.forEach(category -> {
|
|
allDeviceCategories.forEach(category -> {
|
|
|
- if ("A".equals(category.getRemark()) || "B".equals(category.getRemark())) {
|
|
|
|
|
|
|
+ if ("A".equals(category.getRemark())) {
|
|
|
abDeviceCategoryIds.add(category.getId());
|
|
abDeviceCategoryIds.add(category.getId());
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
@@ -1703,7 +1703,7 @@ public class IotRdDailyReportServiceImpl implements IotRdDailyReportService {
|
|
|
List<IotProductClassifyDO> allDeviceCategories = iotProductClassifyMapper.selectList(deviceCategoryReqVO);
|
|
List<IotProductClassifyDO> allDeviceCategories = iotProductClassifyMapper.selectList(deviceCategoryReqVO);
|
|
|
if (CollUtil.isNotEmpty(allDeviceCategories)) {
|
|
if (CollUtil.isNotEmpty(allDeviceCategories)) {
|
|
|
allDeviceCategories.forEach(category -> {
|
|
allDeviceCategories.forEach(category -> {
|
|
|
- if ("A".equals(category.getRemark()) || "B".equals(category.getRemark())) {
|
|
|
|
|
|
|
+ if ("A".equals(category.getRemark())) {
|
|
|
abDeviceCategoryIds.add(category.getId());
|
|
abDeviceCategoryIds.add(category.getId());
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|