ee8c87bf 张雷

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

2 个父辈 9b9c5a44 ce2a0de1
......@@ -147,7 +147,7 @@ public class CommandCentreServiceImpl implements ICommandCentreService {
sql += " where aaa.equipment_level = '6bf727eb7e7cca6a95c694dab0036b2c'";//A类设备
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);
return dataMap;
}
......
......@@ -34,4 +34,16 @@ public class InspectionAbnormalItemsTrendVO {
private Integer notCheckedItemsCount;
@ApiModelProperty(value = "异常项数量")
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;
}
}
}
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!