监督端-执法检查统计-占比显示

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java

@@ -88,20 +88,18 @@ public class EnforcementRegistrationController extends BaseController
         model.addAttribute("total",list.size());
         model.addAttribute("unite",uniteList.size());
         /*model.addAttribute("uniteDouble",String.format("%.3f",((double)uniteList.size()/list.size())));*/
-        String uniteDouble=str1.format((double)uniteList.size()/list.size());
-        if(uniteDouble.equals("NaN")){
-            model.addAttribute("uniteDouble","-");
+        if(uniteList.size()>0){
+            model.addAttribute("uniteDouble",str1.format((double)uniteList.size()/list.size()));
         }else {
-            model.addAttribute("uniteDouble", uniteDouble);
+            model.addAttribute("uniteDouble", "0.00%");
         }
         model.addAttribute("check",checkName);//！！
         model.addAttribute("checkNumber",checkList.size());
         /*model.addAttribute("checkDouble",String.format("%.3f",((double)checkList.size()/list.size())));*/
-        String checkDouble=str1.format((double)checkList.size()/list.size());
-        if(checkDouble.equals("NaN")){
-            model.addAttribute("checkDouble","-");
+        if(checkList.size()>0){
+            model.addAttribute("checkDouble",str1.format((double)checkList.size()/list.size()));
         }else {
-            model.addAttribute("checkDouble", checkDouble);
+            model.addAttribute("checkDouble", "0.00%");
         }
         return prefix + "/registration";
     }
@@ -305,19 +303,17 @@ public class EnforcementRegistrationController extends BaseController
             checkName = iDictDataService.selectDictLabel("check_category", "01");
         }
         model.addAttribute("unite",uniteList.size());
-        String uniteDouble=str1.format((double)uniteList.size()/list.size());
-        if(uniteDouble.equals("NaN")){
-            model.addAttribute("uniteDouble","-");
+        if(uniteList.size()>0){
+            model.addAttribute("uniteDouble",str1.format((double)uniteList.size()/list.size()));
         }else {
-            model.addAttribute("uniteDouble", uniteDouble);
+            model.addAttribute("uniteDouble", "0.00%");
         }
         model.addAttribute("check",checkName);
         model.addAttribute("checkNumber",checkList.size());
-        String checkDouble=str1.format((double)checkList.size()/list.size());
-        if(checkDouble.equals("NaN")){
-            model.addAttribute("checkDouble","-");
+        if(checkList.size()>0){
+            model.addAttribute("checkDouble",str1.format((double)checkList.size()/list.size()));
         }else {
-            model.addAttribute("checkDouble", checkDouble);
+            model.addAttribute("checkDouble", "0.00%");
         }
         return prefix+"/fragmentA";
     }