|
@@ -140,7 +140,7 @@ public class IotRhDailyReportServiceImpl implements IotRhDailyReportService {
|
|
AtomicReference<String> deviceNewStatus = new AtomicReference<>(StrUtil.EMPTY);
|
|
AtomicReference<String> deviceNewStatus = new AtomicReference<>(StrUtil.EMPTY);
|
|
// 日报状态 与 设备状态 对应关系
|
|
// 日报状态 与 设备状态 对应关系
|
|
// 动迁 施工 现场待命/驻地待命(待命) pms_device_status
|
|
// 动迁 施工 现场待命/驻地待命(待命) pms_device_status
|
|
- List<DictDataDO> dictDatas = dictDataService.getDictDataListByDictType("rq_iot_project_work_progress");
|
|
|
|
|
|
+ List<DictDataDO> dictDatas = dictDataService.getDictDataListByDictType("constructionStatus");
|
|
AtomicReference<String> dailyDictLabel = new AtomicReference<>(StrUtil.EMPTY);
|
|
AtomicReference<String> dailyDictLabel = new AtomicReference<>(StrUtil.EMPTY);
|
|
List<DictDataDO> deviceDictDatas = dictDataService.getDictDataListByDictType("pms_device_status");
|
|
List<DictDataDO> deviceDictDatas = dictDataService.getDictDataListByDictType("pms_device_status");
|
|
if (CollUtil.isNotEmpty(dictDatas)) {
|
|
if (CollUtil.isNotEmpty(dictDatas)) {
|