Merge branch 'dev' of chinawu123/wlyy2.0 into dev

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/statistics/StatisticsService.java

@@ -3788,9 +3788,9 @@ public class StatisticsService {
        total = jdbcTemplate.queryForList(sevenDayUseSql,Integer.class);
        Float num = 0F;
        if (total.size()>0) {
            num= (float)Integer.parseInt(jsonObject.get("deviceTotal").toString())/(float)total.get(0);
            num= (float)total.get(0)/(float)Integer.parseInt(jsonObject.get("deviceTotal").toString());
        }
        jsonObject.put("sevenDayUse",num);
        jsonObject.put("sevenDayUse",num*100);
        return jsonObject;
    }