From 702eff6f8681fced0d1b3b59503a01014fcfd343 Mon Sep 17 00:00:00 2001
From: shil <452061493@qq.com>
Date: Fri, 29 Aug 2025 18:45:12 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E9=80=89=E6=8B=A9=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=A0=B7=E5=BC=8F=E8=BF=98=E9=9C=80=E8=A6=81=E5=BE=AE?=
 =?UTF-8?q?=E8=B0=83=E4=B8=8B=20.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/code/statistical/home.html        | 25 +++++++++++--------
 .../StatisticalPanelController.java           |  2 ++
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/home.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/home.html
index 6f2cfeac..40601463 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/home.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/home.html
@@ -88,31 +88,31 @@
       <div class="count_wrap" id="nonRegistrationType">
         <div class="count_item">
           <label><img src="/statistical/images/icon_24_r1.png" alt="日常巡查" />日常巡查</label>
-          <span class="number_count">9,027</span></div>
+          <span class="number_count">0</span></div>
         <div class="count_item">
           <label><img src="/statistical/images/icon_24_r2.png" alt="普法宣传" />普法宣传</label>
-          <span class="number_count">1,395</span></div>
+          <span class="number_count">0</span></div>
         <div class="count_item">
           <label><img src="/statistical/images/icon_24_r3.png" alt="企业服务" />企业服务</label>
-          <span class="number_count">5,226</span></div>
+          <span class="number_count">0</span></div>
         <div class="count_item">
           <label><img src="/statistical/images/icon_24_r4.png" alt="技术指导" />技术指导</label>
-          <span class="number_count">5,360</span></div>
+          <span class="number_count">0</span></div>
         <div class="count_item">
           <label><img src="/statistical/images/icon_24_r5.png" alt="检验检测" />检验检测</label>
-          <span class="number_count">2,705</span></div>
+          <span class="number_count">0</span></div>
         <div class="count_item">
           <label><img src="/statistical/images/icon_24_r6.png" alt="诉求处理" />诉求处理</label>
-          <span class="number_count">1,095</span></div>
+          <span class="number_count">0</span></div>
         <div class="count_item">
           <label><img src="/statistical/images/icon_24_r7.png" alt="培训" />培训</label>
-          <span class="number_count">818</span></div>
+          <span class="number_count">0</span></div>
         <div class="count_item">
           <label><img src="/statistical/images/icon_24_r8.png" alt="调研" />调研</label>
-          <span class="number_count">4,495</span></div>
+          <span class="number_count">0</span></div>
         <div class="count_item">
           <label><img src="/statistical/images/icon_24_r9.png" alt="其他" />其他</label>
-          <span class="number_count">3,340</span></div>
+          <span class="number_count">0</span></div>
       </div>
       <div class="chartbox_right" id="echartCateNon"></div>
     </div>
@@ -241,7 +241,8 @@
     base_html += '      </ul>';
     base_html += '    </div>';
     base_html += '  </div>';
-
+    q_jc_num = 0;
+    q_njc_num = 0;
     for (var i=0; i <areas.length; i++) {
       $.ajax({
         url: ctx + "code/statisticalPanel/areaRegistration",
@@ -250,13 +251,13 @@
         dataType: 'json',
         contentType: "application/json",
         success: function (result) {
-          console.log(result)
           q_jc_num += result.data.allNum;
           q_njc_num += result.data.njcNum;
           $("#q_jc_num").text(q_jc_num);
           $("#q_njc_num").text(q_njc_num);
           $("#s_jc_num").text($("#jc_all").text() - q_jc_num);
           $("#s_njc_num").text($("#njc_all").text() - q_njc_num);
+          console.log(result.data.area +' -> '+ result.data.njcNum +' : '+ ($("#njc_all").text() - q_njc_num))
           switch (result.data.area) {
             case '光明区':
               let gmHtml = base_html.replaceAll("{area}", result.data.area)
@@ -658,7 +659,9 @@
       dataType: 'json',
       contentType: "application/json",
       success: function (result) {
+        non_jc_all = result.data.nonNum;
         $("#jc_all").text(result.data.allNum);
+        $("#njc_all").text(result.data.nonNum);
         $("#unite_num").text(result.data.unionNum);
         $("#unite_yoy").text(result.data.unionYoy+"%");
         $("#unite_rr").text(result.data.unionRr+"%");
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticalPanelController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticalPanelController.java
index 207dc99d..5632e8fa 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticalPanelController.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticalPanelController.java
@@ -227,7 +227,9 @@ public class StatisticalPanelController extends BaseController {
 
         // 全市行政检查数量
         Integer all_num = statisticalPaneService.analysisEnterprisesAll(params);
+        Integer non_num = statisticalPaneService.analysis_non_enterprisesIns(params);
         resMap.put("allNum", all_num);
+        resMap.put("nonNum", non_num);
 
         // 全市行政联合检查数量
         Integer union_num = statisticalPaneService.analysisEnterprisesUnion(params);