From 707209279487e3d2cf6afe9a41fac3a28f797a3d Mon Sep 17 00:00:00 2001
From: zouyx <1798599149@qq.com>
Date: Mon, 10 Feb 2025 17:49:43 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E7=9D=A3=E7=AB=AF-=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=8C=BA=E5=9F=9F=E6=88=96=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../statisticsEnterprise.html                 | 20 +++++++++++++++++++
 .../zdxt/code/domain/StatisticsIndicator.java |  1 +
 2 files changed, 21 insertions(+)

diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsEnterprise/statisticsEnterprise.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsEnterprise/statisticsEnterprise.html
index d1ca5dfb..7876965f 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsEnterprise/statisticsEnterprise.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsEnterprise/statisticsEnterprise.html
@@ -190,6 +190,8 @@
                 {
                     field : 'name',
                     title : '区域',
+                    sortable: true,
+                    sorter: "sortQYName",
                     formatter:function (value,row,index) {
                         if(value=="其他"){
                             return '<span>'+value+'</span>';
@@ -201,6 +203,7 @@
                 {
                     field : 'totalNumber',
                     title : '企业数量',
+                    sortable: true,
                 },
                 {
                     field : 'numInt',
@@ -448,6 +451,8 @@
                         {
                             field : 'name',
                             title : '街道',
+                            sortable: true,
+                            sorter: "sortQYName",
                             formatter:function (value,row,index) {
                                 var obj=document.getElementById("jd");
                                 var options=obj.options;
@@ -464,6 +469,7 @@
                         {
                             field : 'totalNumber',
                             title : '企业数量',
+                            sortable: true,
                         },
                         {
                             field : 'numInt',
@@ -575,6 +581,20 @@
             }
         })
     }
+
+    function sortTotalNumber(){
+        console.log("sort")
+    }
+    function sortQYName(a,b,objA,objB){
+        if (objA.sort < objB.sort) {
+            return -1;
+        }
+        if (objA.sort > objB.sort) {
+            return 1;
+        }
+        return 0;
+    }
+
     /*******echarts:企业类型/占比*********/
 
 /*    const ecsh = echarts.init(document.getElementById("echartEnterprise"));
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/StatisticsIndicator.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/StatisticsIndicator.java
index e4f7fa93..7cdaeeb7 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/StatisticsIndicator.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/StatisticsIndicator.java
@@ -26,6 +26,7 @@ public class StatisticsIndicator extends BaseDomain  implements Comparable<Stati
     private String percentage;
     private Integer totalNumber;
     private String address;
+    private int sort;
 
     public void setNumDouble(Double numDouble) {
         this.numDouble = new Double(String.format("%.3f",numDouble));