From 6cebcdd663ac06a6a8aa931058a515aa38a14bc3 Mon Sep 17 00:00:00 2001 From: fengjin <1435304038@qq.com> Date: 星期二, 01 十一月 2022 15:56:42 +0800 Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test --- flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java b/flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java index 57ce7f3..90b22a7 100644 --- a/flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java +++ b/flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java @@ -162,8 +162,15 @@ { // 回复率=最新进展里大于0条回复的导办工单数量/总工单数量 //状态(1待分配 2 待办结 3 已办结 4 待评价 5 已取消 6未解决 7已解决 8 系统自动分配 9 回复 10转派 11手动分配) - String reversionRate=weekDf.format((float)(homeStatisticsService.reversionRate("9",null)/(float)allNum)); - entity.setReversionRate(reversionRate); + + String num=(homeStatisticsService.reversionRate("9",null)); + if(!StringUtils.isEmpty(num)) + { + String reversionRate=weekDf.format(Float.valueOf(num)/(float)allNum); + entity.setReversionRate(reversionRate); + } + + } return ResultData.success(entity); @@ -244,7 +251,7 @@ if(allNum>0 && score>0) { java.text.DecimalFormat weekDf=new java.text.DecimalFormat("##.##");//传入格式模板 - String workEfficiency=weekDf.format((float)(score/allNum)); + String workEfficiency=weekDf.format((float)score/(float)allNum); bean.setNum(workEfficiency); } } -- Gitblit v1.7.1