Merge remote-tracking branch 'origin/develop' into develop

dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/iot/service/impl/HistoryIotServiceImpl.java

@@ -101,7 +101,7 @@ public class HistoryIotServiceImpl implements HistoryIotService {
                         JSONObject dataItem = (JSONObject) jsonNode;
                         JSONObject item = new JSONObject();
                         item.put("time", dataItem.getString("data_time"));
-                        item.put("data", dataItem.getString("data_value"));
+                        item.put("data", dataItem.getDouble("data_value"));
                         data.add(item);
                     }
                 }

dmp-business/dmp-rwd/src/main/resources/mapper/EquipmentReportMapper.xml

@@ -6,7 +6,7 @@
         select pj.id as projectId, pj.name as projectName, count(eq.id) as equipmentTotal,
           sum(case when
             ifnull(json_extract(eq.infos, '$.expectScrapDate'), '9999-12-31') < #{scrapDate}
-            then 1 else 0 end) as expectScrapToal
+            then 1 else 0 end) as expectScrapTotal
         from dt_object pj left join dt_object eq on eq.project_id = pj.id
           and eq.obj_type = 'equipment' and eq.valid = 1
         where pj.obj_type = 'project' and pj.valid = 1