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

@@ -147,7 +147,7 @@ public class CommandCentreServiceImpl implements ICommandCentreService {
         sql += " where aaa.equipment_level = '6bf727eb7e7cca6a95c694dab0036b2c'";//A类设备
         sql += " where aaa.equipment_level = '6bf727eb7e7cca6a95c694dab0036b2c'";//A类设备
         List<EquipmentRepairAnalysisVO> dataList =  getJdbcTemplate().query(sql,new BeanPropertyRowMapper<EquipmentRepairAnalysisVO>(EquipmentRepairAnalysisVO.class));;
         List<EquipmentRepairAnalysisVO> dataList =  getJdbcTemplate().query(sql,new BeanPropertyRowMapper<EquipmentRepairAnalysisVO>(EquipmentRepairAnalysisVO.class));;
 
 
-        dataMap.put("totalCost",JSUtils.subtract(repairCost,maintainCost));
+        dataMap.put("totalCost",JSUtils.add(repairCost,maintainCost));
         dataMap.put("dataList",dataList);
         dataMap.put("dataList",dataList);
         return dataMap;
         return dataMap;
     }
     }

@@ -34,4 +34,16 @@ public class InspectionAbnormalItemsTrendVO {
     private Integer notCheckedItemsCount;
     private Integer notCheckedItemsCount;
     @ApiModelProperty(value = "异常项数量")
     @ApiModelProperty(value = "异常项数量")
     private Integer abnormalItemsCount;
     private Integer abnormalItemsCount;
+
+    public Integer getNotCheckedItemsCount() {
+        if (totalCount != null && checkedItemsCount != null) {
+            if (totalCount - checkedItemsCount < 0) {
+                return checkedItemsCount - totalCount;
+            } else {
+                return totalCount - checkedItemsCount;
+            }
+        } else {
+            return 0;
+        }
+    }
 }
 }