From f03287190fcdd9296d42b825cd4de48f046f0dc7 Mon Sep 17 00:00:00 2001
From: zouyx <1798599149@qq.com>
Date: Thu, 12 Dec 2024 11:21:43 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E7=9D=A3=E7=AB=AF-=E6=89=A7=E6=B3=95?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5=E7=BB=9F=E8=AE=A1-=E5=8D=A0=E6=AF=94?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EnforcementRegistrationController.java    | 28 ++++++++-----------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java
index 4aa157e6..647fb5a3 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java
+++ b/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";
     }