From 2bead4ab071462da3942cd22ba16f9713830ed47 Mon Sep 17 00:00:00 2001
From: zouyx <1798599149@qq.com>
Date: Wed, 14 May 2025 15:55:31 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E7=9D=A3=E7=AB=AF-=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../code/complaintStatic/complaintA.html      |   3 +-
 .../code/complaintStatic/complaintB.html      |   3 +-
 .../code/complaintStatic/complaintStatic.html | 186 +++-
 .../project/code/registration/fragmentA.html  |   2 +-
 .../code/registration/registration.html       | 842 ++----------------
 .../code/registration/staticRegistration.html |   4 +-
 .../controller/ComplaintStaticController.java |  72 +-
 .../EnforcementRegistrationController.java    |  19 +-
 .../zdxt/code/domain/ComplaintStatistics.java |   9 +
 .../service/ComplaintStatisticsService.java   |   4 +-
 .../service/impl/ComplaintStatisticsImpl.java |   8 +-
 .../EnforcementRegistrationServiceImpl.java   |   6 +-
 .../mapper/ComplaintStatisticsMapper.xml      |  45 +-
 .../mapper/EnforcementRegistrationMapper.xml  |   9 +
 14 files changed, 356 insertions(+), 856 deletions(-)
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintA.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintA.html
index d6f28d2b..7a33fd6e 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintA.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintA.html
@@ -3,7 +3,8 @@
 <head>
     <meta charset="UTF-8">
     <li id="complaintA" th:fragment="complaintA">
-        <p th:text="${selectTime}"></p>
+<!--        <p th:text="${selectTime}"></p>-->
+        <p><span id="timeString"></span></p>
         <p><label th:text="投诉数量"></label><b th:text="${Number1}"></b></p>
         <p></i><label th:text="被投诉对象"></label><b th:text="${Number2}"></b></p>
     </li>
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintB.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintB.html
index 50569d2c..deee81e4 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintB.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintB.html
@@ -3,7 +3,8 @@
 <head>
     <meta charset="UTF-8">
     <li id="complaintB" th:fragment="complaintB">
-        <p><span th:text="|${year}年:|"></span></p>
+<!--        <p><span th:text="|${year}年:|"></span></p>-->
+        <p><span id="timeString2"></span></p>
         <p><label th:text="总数量"></label><b th:text="${total}"></b></p>
         <p><label th:text="投诉数量"></label><b th:text="${Number3}"></b></p>
         <p></i><label th:text="占比总计"></label><b th:text="${dou}"></b></p>
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintStatic.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintStatic.html
index 1db05b9d..ce791261 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintStatic.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintStatic.html
@@ -75,14 +75,14 @@
                                     <option value="day">自定义时间</option>
                                 </select>
                                 <select id="quarter" name="quarter" style="width: 100px">
-                                    <option value="0">所有</option>
+                                    <option value="">所有</option>
                                     <option value="1">第1季度</option>
                                     <option value="2">第2季度</option>
                                     <option value="3">第3季度</option>
                                     <option value="4">第4季度</option>
                                 </select>
                                 <select id="month" name="month" style="width: 60px">
-                                    <option value="0">所有</option>
+                                    <option value="">所有</option>
                                     <option value="01">1月</option>
                                     <option value="02">2月</option>
                                     <option value="03">3月</option>
@@ -112,7 +112,7 @@
                         <div class="static-content">
                             <ul>
                                 <li id="complaintA" th:fragment="complaintA">
-                                    <p th:text="${selectTime}"></p>
+                                    <p><span id="timeString"></span></p>
                                     <p><label th:text="投诉数量"></label><b th:text="${Number1}"></b></p>
                                     <p></i><label th:text="被投诉对象"></label><b th:text="${Number2}"></b></p>
                                 </li>
@@ -138,17 +138,18 @@
                                 <select id="year2" name="year">
                                     <option th:each="y:${yearList}" th:text="${y}" th:value="${y}"></option>
                                 </select>
-                                <select id="dateSearch2" name="dateSearch" onchange="timeType2()" >
+                                <select id="timeType2" name="timeType" onchange="timeTypeChange2()" >
                                     <option value="year">年度</option>
                                     <option value="quarter">季度</option>
                                     <option value="month">月度</option>
+                                    <option value="day">自定义时间</option>
                                 </select>
                                 <select id="quarter2" name="quarter">
                                     <option value="">所有</option>
-                                    <option value="1">第一季度</option>
-                                    <option value="2">第二季度</option>
-                                    <option value="3">第三季度</option>
-                                    <option value="4">第四季度</option>
+                                    <option value="1">第1季度</option>
+                                    <option value="2">第2季度</option>
+                                    <option value="3">第3季度</option>
+                                    <option value="4">第4季度</option>
                                 </select>
                                 <select id="month2" name="month">
                                     <option value="">所有</option>
@@ -166,6 +167,12 @@
                                     <option value="12">12月</option>
                                 </select>
                             </li>
+                            <li id="day2" class="day" style="display: flex;">
+                                <p>自定义时间：</p>
+                                <input type="text" class="time-input" id="beginTime2" placeholder="开始时间" name="beginTime" style="width: 100px"/>
+                                <span>-</span>
+                                <input type="text" class="time-input" id="endTime2" placeholder="结束时间" name="endTime" style="width: 100px"/>
+                            </li>
                             <li>
                                 <a class="btn btn-success btn-sm" onclick="searchComplaint2()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                                 <a class="btn btn-reset btn-sm" onclick="complaintRest2()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
@@ -175,7 +182,8 @@
                         <div class="static-content" style="margin: 1% 0;">
                             <ul>
                                 <li id="complaintB" th:fragment="complaintB">
-                                    <p><span th:text="|${year}年:|"></span></p>
+<!--                                    <p><span th:text="|${year}年:|"></span></p>-->
+                                    <p><span id="timeString2"></span></p>
                                     <p><label th:text="总数量"></label><b th:text="${Number3}"></b></p>
                                     <p><label th:text="投诉数量"></label><b th:text="${Number3}"></b></p>
                                     <p></i><label th:text="占比总计"></label><b th:text="${dou}"></b></p>
@@ -184,7 +192,7 @@
                             <ul>
                                 <li style="margin-top: 7px;">
                                     <p>类型：</p>
-                                    <select id="qy" name="qy" th:with="type=${@dict.getType('address_type')}" onchange="searchComplaint2()">
+                                    <select id="qy" name="type" th:with="type=${@dict.getType('address_type')}" onchange="searchComplaint2()">
                                         <option value="type">投诉类型</option>
                                         <option value="">全市</option>
                                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
@@ -237,6 +245,7 @@
             $("#day").hide();
             $("#quarter2").hide();
             $("#month2").hide();
+            $("#day2").hide();
             $('#detail').hide();
             rTable1();
             rTable2();
@@ -244,6 +253,8 @@
             $('#cont-two-2').hide();
             $('#cont-two-3').hide();
             rTable2();
+            getTimeString()
+            getTimeString2();
         };
         $(function() {
             var options1 = {
@@ -485,6 +496,7 @@
                 data:params,
                 success: function (response) {
                     $('#complaintA').html(response);
+                    getTimeString();
                 }
             })
         }
@@ -517,6 +529,7 @@
                 success: function (response) {
                     console.log(response);
                     $('#complaintB').html(response);
+                    getTimeString2();
                 }
             })
         }
@@ -731,7 +744,7 @@
                 document.getElementById("endTime").value="";
                 $("#quarter").show();
                 $("#month").hide();
-                document.getElementById("month").value="0";
+                document.getElementById("month").value="";
             }else if(dateSearch.value=="month"){
                 $("#year").show();
                 if(document.getElementById("year").value==''){
@@ -741,16 +754,16 @@
                 document.getElementById("beginTime").value="";
                 document.getElementById("endTime").value="";
                 $("#quarter").hide();
-                document.getElementById("quarter").value="0";
+                document.getElementById("quarter").value="";
                 $("#month").show();
             }else if(dateSearch.value=="day"){
                 $("#day").show();
                 $("#year").hide();
                 document.getElementById("year").value="";
                 $("#quarter").hide();
-                document.getElementById("quarter").value="0";
+                document.getElementById("quarter").value="";
                 $("#month").hide();
-                document.getElementById("month").value="0";
+                document.getElementById("month").value="";
             }else {
                 $("#year").show();
                 if(document.getElementById("year").value==''){
@@ -760,29 +773,146 @@
                 document.getElementById("beginTime").value="";
                 document.getElementById("endTime").value="";
                 $("#quarter").hide();
-                document.getElementById("quarter").value="0";
+                document.getElementById("quarter").value="";
                 $("#month").hide();
-                document.getElementById("month").value="0";
+                document.getElementById("month").value="";
             }
         }
-        function timeType2() {
-            var dateSearch = document.getElementById("dateSearch2");
+        function getTimeString(){
+            if(document.getElementById("dateSearch").value=="year"){
+                $("#timeString").text(document.getElementById("year").value+"年")
+            }else if(document.getElementById("dateSearch").value=="quarter"){
+                let doc=document.getElementById("quarter")
+                let index=doc.selectedIndex
+                let text=document.getElementById("year").value+"年"
+                if(doc.value!=null&&doc.value!=""){
+                    text=text+doc.options[index].text;
+                }
+                $("#timeString").text(text);
+            }else if(document.getElementById("dateSearch").value=="month"){
+                let doc=document.getElementById("month")
+                let index=doc.selectedIndex
+                let text=document.getElementById("year").value+"年"
+                if(doc.value!=null&&doc.value!=""){
+                    text=text+doc.options[index].text;
+                }
+                $("#timeString").text(text);
+            }else if(document.getElementById("dateSearch").value=="day"){
+                let beginTime=document.getElementById("beginTime").value;
+                let endTime=document.getElementById("endTime").value;
+                console.log(beginTime);
+                console.log(endTime);
+                if(beginTime!=null&&beginTime!=""){
+                    if(endTime!=null&&endTime!=""){
+                        $("#timeString").text(beginTime+"~"+endTime);
+                    }else{
+                        $("#timeString").text(beginTime+"~");
+                    }
+                }else if(endTime!=null&&endTime!=""){
+                    $("#timeString").text("~"+endTime);
+                }else{
+                    $("#timeString").text("~");
+                }
+            }
+        }
+        function timeTypeChange2() {
+            var dateSearch = document.getElementById("timeType2");
             console.log(dateSearch.value);
+            /*if(dateSearch.value=="quarter"){
+                $("#quarter2").show();
+                $("#month2").hide();
+                document.getElementById("month2").value="";
+            }else if(dateSearch.value=="month"){
+                $("#quarter2").hide();
+                document.getElementById("quarter2").value="";
+                $("#month2").show();
+            }else {
+                $("#quarter2").hide();
+                document.getElementById("quarter2").value="";
+                $("#month2").hide();
+                document.getElementById("month2").value="";
+            }*/
             if(dateSearch.value=="quarter"){
+                $("#year2").show();
+                if(document.getElementById("year2").value==''){
+                    document.getElementById("year2").value=currentYear;
+                }
+                $("#day2").hide();
+                document.getElementById("beginTime2").value="";
+                document.getElementById("endTime2").value="";
                 $("#quarter2").show();
                 $("#month2").hide();
                 document.getElementById("month2").value="";
             }else if(dateSearch.value=="month"){
+                $("#year2").show();
+                if(document.getElementById("year2").value==''){
+                    document.getElementById("year2").value=currentYear;
+                }
+                $("#day2").hide();
+                document.getElementById("beginTime2").value="";
+                document.getElementById("endTime2").value="";
                 $("#quarter2").hide();
                 document.getElementById("quarter2").value="";
                 $("#month2").show();
+            }else if(dateSearch.value=="day"){
+                $("#day2").show();
+                $("#year2").hide();
+                document.getElementById("year2").value="";
+                $("#quarter2").hide();
+                document.getElementById("quarter2").value="";
+                $("#month2").hide();
+                document.getElementById("month2").value="";
             }else {
+                $("#year2").show();
+                if(document.getElementById("year2").value==''){
+                    document.getElementById("year2").value=currentYear;
+                }
+                $("#day2").hide();
+                document.getElementById("beginTime2").value="";
+                document.getElementById("endTime2").value="";
                 $("#quarter2").hide();
                 document.getElementById("quarter2").value="";
                 $("#month2").hide();
                 document.getElementById("month2").value="";
             }
         }
+        function getTimeString2(){
+            if(document.getElementById("timeType2").value=="year"){
+                $("#timeString2").text(document.getElementById("year2").value+"年")
+            }else if(document.getElementById("timeType2").value=="quarter"){
+                let doc=document.getElementById("quarter2")
+                let index=doc.selectedIndex
+                let text=document.getElementById("year2").value+"年"
+                if(doc.value!=null&&doc.value!=""){
+                    text=text+doc.options[index].text;
+                }
+                $("#timeString2").text(text);
+            }else if(document.getElementById("timeType2").value=="month"){
+                let doc=document.getElementById("month2")
+                let index=doc.selectedIndex
+                let text=document.getElementById("year2").value+"年"
+                if(doc.value!=null&&doc.value!=""){
+                    text=text+doc.options[index].text;
+                }
+                $("#timeString2").text(text);
+            }else if(document.getElementById("timeType2").value=="day"){
+                let beginTime=document.getElementById("beginTime2").value;
+                let endTime=document.getElementById("endTime2").value;
+                console.log(beginTime);
+                console.log(endTime);
+                if(beginTime!=null&&beginTime!=""){
+                    if(endTime!=null&&endTime!=""){
+                        $("#timeString2").text(beginTime+"~"+endTime);
+                    }else{
+                        $("#timeString2").text(beginTime+"~");
+                    }
+                }else if(endTime!=null&&endTime!=""){
+                    $("#timeString2").text("~"+endTime);
+                }else{
+                    $("#timeString2").text("~");
+                }
+            }
+        }
         function sComplaint(eName){
             var currentId=$('form').eq(0).attr('id');
             var params = $.common.formToJSON(currentId);
@@ -819,7 +949,7 @@
         }
         function complaintRest2(){
             $('form').eq(1).trigger("reset");
-            timeType2();
+            timeTypeChange2();
             document.getElementById("qy").value="type";
             searchComplaint2();
         }
@@ -869,8 +999,8 @@
             var params = $.common.formToJSON(currentId);
             delete params.dateSearch;
             if(document.getElementById("qy").value=="type") {
-                $.ajax({
-                    type: "POST",
+/*                $.ajax({
+                    type: "GET",
                     data: JSON.stringify(params),
                     contentType: 'application/json',
                     //设置响应类型
@@ -887,7 +1017,7 @@
                         document.body.removeChild(link)
                     }
                 })
-                console.log(params)
+                console.log(params)*/
                 let paramsList=[]
                 for(var key in params){
                     if (params.hasOwnProperty(key)) {
@@ -902,8 +1032,8 @@
                 console.log(paramsList.join("&"))
                 window.location.href = prefix +"/export2?"+paramsList.join("&")
             }else if(document.getElementById("qy").value==""){
-                $.ajax({
-                    type: "POST",
+/*                $.ajax({
+                    type: "GET",
                     data: JSON.stringify(params),
                     contentType: 'application/json',
                     //设置响应类型
@@ -919,7 +1049,7 @@
                         link.click();
                         document.body.removeChild(link)
                     }
-                })
+                })*/
                 console.log(params)
                 let paramsList=[]
                 for(var key in params){
@@ -935,8 +1065,8 @@
                 console.log(paramsList.join("&"))
                 window.location.href = prefix +"/export3?"+paramsList.join("&")
             }else{
-                $.ajax({
-                    type: "POST",
+/*                $.ajax({
+                    type: "GET",
                     data: JSON.stringify(params),
                     contentType: 'application/json',
                     //设置响应类型
@@ -952,7 +1082,7 @@
                         link.click();
                         document.body.removeChild(link)
                     }
-                })
+                })*/
                 console.log(params)
                 let paramsList=[]
                 for(var key in params){
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/fragmentA.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/fragmentA.html
index 77cfd15c..d749a225 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/fragmentA.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/fragmentA.html
@@ -7,7 +7,7 @@
     <p th:text="|占比  ${uniteDouble}|"></p>
     <p th:text="|${check}  ${checkNumber}|"></p>
     <p th:text="|占比  ${checkDouble}|"></p>-->
-    <p th:text="|${year}年:|"></p>
+    <p><span id="timeString"></span></p>
     <p><label th:text="涉企检查总数"></label><b th:text="${total}"></b></p>
     <p><label th:text="联合检查"></label><b th:text="${unite}"></b><span th:text="占比"></span><b th:text="${uniteDouble}"></b></p>
     <p><label th:text="${check}"></label><b th:text="${checkNumber}"></b><span th:text="占比"></span><b th:text="${checkDouble}"></b></p>
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html
index b27d9874..7a1c453e 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html
@@ -108,10 +108,10 @@
                                     </select>
                                     <select id="quarter" name="quarter">
                                         <option value="">所有</option>
-                                        <option value="1">第一季度</option>
-                                        <option value="2">第二季度</option>
-                                        <option value="3">第三季度</option>
-                                        <option value="4">第四季度</option>
+                                        <option value="1">第1季度</option>
+                                        <option value="2">第2季度</option>
+                                        <option value="3">第3季度</option>
+                                        <option value="4">第4季度</option>
                                     </select>
                                     <select id="month" name="month">
                                         <option value="">所有</option>
@@ -150,7 +150,7 @@
                                         <p th:text="|占比  ${checkDouble}|"></p>
                                     </li>-->
                                     <li id="a" th:fragment="a">
-                                        <p th:text="|${year}年:|"></p>
+                                        <p><span id="timeString"></span></p>
                                         <p><label th:text="涉企检查总数"></label><b th:text="${total}"></b></p>
                                         <p><label th:text="联合检查"></label><b th:text="${unite}"></b><span th:text="占比"></span><b th:text="${uniteDouble}"></b></p>
                                         <p><label th:text="${check}"></label><b th:text="${checkNumber}"></b><span th:text="占比"></span><b th:text="${checkDouble}"></b></p>
@@ -189,13 +189,14 @@
                                                 <option value="year">年度</option>
                                                 <option value="quarter">季度</option>
                                                 <option value="month">月度</option>
+                                                <option value="select-time">自定义时段</option>
                                             </select>
                                             <select id="quarter2" name="quarter">
                                                 <option value="">所有</option>
-                                                <option value="1">第一季度</option>
-                                                <option value="2">第二季度</option>
-                                                <option value="3">第三季度</option>
-                                                <option value="4">第四季度</option>
+                                                <option value="1">第1季度</option>
+                                                <option value="2">第2季度</option>
+                                                <option value="3">第3季度</option>
+                                                <option value="4">第4季度</option>
                                             </select>
                                             <select id="month2" name="month">
                                                 <option value="">所有</option>
@@ -213,6 +214,12 @@
                                                 <option value="12">12月</option>
                                             </select>
                                         </li>
+                                        <li id="select-time2" class="select-time">
+                                            <p>检查时间：</p>
+                                            <input type="text" class="time-input" id="startTime2" placeholder="开始时间" name="beginTime"/>
+                                            <span>-</span>
+                                            <input type="text" class="time-input" id="endTime2" placeholder="结束时间" name="endTime"/>
+                                        </li>
                                         <li>
                                             <a class="btn btn-success btn-sm" onclick="search2()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                                             <a class="btn btn-reset btn-sm" onclick="rest2()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
@@ -283,6 +290,8 @@
             $("#select-time").hide();
             $("#quarter2").hide();
             $("#month2").hide();
+            $("#select-time2").hide();
+            getTimeString();
             rTable();
             echarts1();
             echarts2();
@@ -1084,15 +1093,58 @@
         function timeType2() {
             var dateSearch = document.getElementById("dateSearch2");
             console.log(dateSearch.value);
+/*            if(dateSearch.value=="quarter"){
+                $("#quarter2").show();
+                $("#month2").hide();
+                document.getElementById("month2").value="";
+            }else if(dateSearch.value=="month"){
+                $("#quarter2").hide();
+                document.getElementById("quarter2").value="";
+                $("#month2").show();
+            }else {
+                $("#quarter2").hide();
+                document.getElementById("quarter2").value="";
+                $("#month2").hide();
+                document.getElementById("month2").value="";
+            }*/
             if(dateSearch.value=="quarter"){
+                $("#year2").show();
+                if(document.getElementById("year2").value==''){
+                    document.getElementById("year2").value=currentYear;
+                }
+                $("#select-time2").hide();
+                document.getElementById("startTime2").value="";
+                document.getElementById("endTime2").value="";
                 $("#quarter2").show();
                 $("#month2").hide();
                 document.getElementById("month2").value="";
             }else if(dateSearch.value=="month"){
+                $("#year2").show();
+                if(document.getElementById("year2").value==''){
+                    document.getElementById("year2").value=currentYear;
+                }
+                $("#select-time2").hide();
+                document.getElementById("startTime2").value="";
+                document.getElementById("endTime2").value="";
                 $("#quarter2").hide();
                 document.getElementById("quarter2").value="";
                 $("#month2").show();
+            }else if(dateSearch.value=="select-time"){
+                $("#select-time2").show();
+                $("#year2").hide();
+                document.getElementById("year2").value="";
+                $("#quarter2").hide();
+                document.getElementById("quarter2").value="";
+                $("#month2").hide();
+                document.getElementById("month2").value="";
             }else {
+                $("#year2").show();
+                if(document.getElementById("year2").value==''){
+                    document.getElementById("year2").value=currentYear;
+                }
+                $("#select-time2").hide();
+                document.getElementById("startTime2").value="";
+                document.getElementById("endTime2").value="";
                 $("#quarter2").hide();
                 document.getElementById("quarter2").value="";
                 $("#month2").hide();
@@ -1109,6 +1161,7 @@
                 data:params,
                 success: function (response) {
                     $('#a').html(response);
+                    getTimeString();
                 }
             })
             /*var currentId = $.common.isEmpty(formId) ? $('form').attr('id') : formId;
@@ -1135,6 +1188,43 @@
                 }
             })
         }
+        function getTimeString(){
+            if(document.getElementById("dateSearch").value=="year"){
+                $("#timeString").text(document.getElementById("year").value+"年")
+            }else if(document.getElementById("dateSearch").value=="quarter"){
+                let doc=document.getElementById("quarter")
+                let index=doc.selectedIndex
+                let text=document.getElementById("year").value+"年"
+                if(doc.value!=null&&doc.value!=""){
+                    text=text+doc.options[index].text;
+                }
+                $("#timeString").text(text);
+            }else if(document.getElementById("dateSearch").value=="month"){
+                let doc=document.getElementById("month")
+                let index=doc.selectedIndex
+                let text=document.getElementById("year").value+"年"
+                if(doc.value!=null&&doc.value!=""){
+                    text=text+doc.options[index].text;
+                }
+                $("#timeString").text(text);
+            }else if(document.getElementById("dateSearch").value=="select-time"){
+                let beginTime=document.getElementById("startTime").value;
+                let endTime=document.getElementById("endTime").value;
+                console.log(beginTime);
+                console.log(endTime);
+                if(beginTime!=null&&beginTime!=""){
+                    if(endTime!=null&&endTime!=""){
+                        $("#timeString").text(beginTime+"~"+endTime);
+                    }else{
+                        $("#timeString").text(beginTime+"~");
+                    }
+                }else if(endTime!=null&&endTime!=""){
+                    $("#timeString").text("~"+endTime);
+                }else{
+                    $("#timeString").text("~");
+                }
+            }
+        }
         function zhanbi (){
             $.ajax({
                 url:prefix+'/searchType',
@@ -1257,740 +1347,6 @@
             console.log(paramsList.join("&"))
             window.location.href = prefix +"/exportUser?"+paramsList.join("&")
         }
-        /*******2.年度计划TOP10********/
-
-        /*var myChart = echarts.init(document.getElementById('echarts2'));
-        var option = {
-
-            color:["#2d4beb","#03a978",],
-            legend: {
-                y : '10%',
-                x : 'center',
-                data:['2024年', '2025年'],
-                itemWidth: 16,
-                itemHeight: 10,
-                itemGap: 30,
-                textStyle : {
-                    color : 'rgba(0,0,0,.5)',
-
-                }
-            },
-
-            calculable :false,
-
-
-            grid:{
-                left: '1%',
-                right: '2%',
-                bottom: '1%',
-                top: '20%',
-                containLabel: true
-            },
-
-            tooltip : {
-                trigger: 'axis',
-                axisPointer : {
-                    type : 'shadow'
-                }
-            },
-
-
-            xAxis : [
-                {
-                    type : 'category',
-                    data:['执法部门1', '执法部门2', '执法部门3', '执法部门4', '执法部门5', '执法部门6', '执法部门7', '执法部门8', '执法部门9', '执法部门10'],
-                    axisLabel: {
-                        show: true,
-                        rotate: '30',
-                        textStyle: {
-                            color: 'rgba(0,0,0,.5)'
-                        }
-                    },
-                    splitLine:{
-                        lineStyle:{
-                            width:0,
-                            type:'solid'
-                        }
-                    },
-                    inverse: 'true',
-                    axisLine: {
-                        show: false,
-                    },
-                    axisTick: {
-                        show: false
-                    }
-                }
-            ],
-
-
-            yAxis : [
-                {
-                    type : 'value',
-                    axisLabel: {
-                        show: true,
-                        textStyle: {
-                            color: 'rgba(0,0,0,.5)'
-                        }
-                    },
-                    splitLine:{
-                        lineStyle:{
-                            color:['#f2f2f2'],
-                            width:0,
-                            type:'solid',
-                        }
-                    },
-                    axisLine: {
-                        show: false,
-                    },
-                    axisTick: {
-                        show: false
-                    }
-                }
-            ],
-
-            series : [
-                {
-                    name:'2024年',
-                    type:'bar',
-                    barWidth: 15,
-                    barGap: 15,
-                    smooth: false,
-                    stack: '总量',
-                    itemStyle: {
-                        emphasis: {
-                            barBorderRadius: 0
-                        },normal: {
-                            barBorderRadius: 0,
-                            color: new echarts.graphic.LinearGradient(
-                                0, 0, 1, 0,
-                                [
-                                    {offset: 0, color: '#3977E6'},
-                                    {offset: 1, color: '#37BBF8'}
-
-                                ]
-                            )
-                        }},
-                    data:[71, 61, 58, 69, 75, 68, 72, 53, 48, 46],
-                },
-                {
-                    name:'2025年',
-                    type:'bar',
-                    barWidth: 15,
-                    barGap: 15,
-                    smooth: false,
-                    stack: '总量',
-                    //itemStyle : { normal: {label : {show: true, position: 'insideRight'}}},
-                    itemStyle: {
-                        emphasis: {
-                            barBorderRadius: 0
-                        },normal: {
-                            barBorderRadius: 0,
-                            color: new echarts.graphic.LinearGradient(
-                                0, 0, 1, 0,
-                                [
-                                    {offset: 0, color: '#03a978'},
-                                    {offset: 1, color: '#2cfbbe'}
-
-                                ]
-                            )
-                        }},
-                    data:[70, 52, 58, 67, 65, 58, 45, 49, 72, 63]
-                },
-            ]
-        };
-        // 使用刚指定的配置项和数据显示图表。
-        myChart.setOption(option);
-        window.addEventListener("resize",function(){
-            myChart.resize();
-        });
-
-        /!*******3.季度计划TOP10********!/
-
-        var myChart = echarts.init(document.getElementById('echarts3'));
-        var option = {
-
-            color:["#2d4beb","#03a978",'#1f74f1', '#79e24a'],
-            legend: {
-                y : '10%',
-                x : 'center',
-                data:['2024年一季度', '2024年二季度', '2024年三季度', '2024年四季度'],
-                itemWidth: 16,
-                itemHeight: 10,
-                itemGap: 30,
-                textStyle : {
-                    color : 'rgba(0,0,0,.5)',
-
-                }
-            },
-
-            calculable :false,
-
-
-            grid:{
-                left: '1%',
-                right: '2%',
-                bottom: '1%',
-                top: '20%',
-                containLabel: true
-            },
-
-            tooltip : {
-                trigger: 'axis',
-                axisPointer : {
-                    type : 'shadow'
-                }
-            },
-
-
-            xAxis : [
-                {
-                    type : 'category',
-                    data:['执法部门1', '执法部门2', '执法部门3', '执法部门4', '执法部门5', '执法部门6', '执法部门7', '执法部门8', '执法部门9', '执法部门10'],
-                    axisLabel: {
-                        show: true,
-                        rotate: '30',
-                        textStyle: {
-                            color: 'rgba(0,0,0,.5)'
-                        }
-                    },
-                    splitLine:{
-                        lineStyle:{
-                            width:0,
-                            type:'solid'
-                        }
-                    },
-                    inverse: 'true',
-                    axisLine: {
-                        show: false,
-                    },
-                    axisTick: {
-                        show: false
-                    }
-                }
-            ],
-
-
-            yAxis : [
-                {
-                    type : 'value',
-                    axisLabel: {
-                        show: true,
-                        textStyle: {
-                            color: 'rgba(0,0,0,.5)'
-                        }
-                    },
-                    splitLine:{
-                        lineStyle:{
-                            color:['#f2f2f2'],
-                            width:0,
-                            type:'solid',
-                        }
-                    },
-                    axisLine: {
-                        show: false,
-                    },
-                    axisTick: {
-                        show: false
-                    }
-                }
-            ],
-
-            series : [
-                {
-                    name:'2024年一季度',
-                    type:'bar',
-                    barWidth: 15,
-                    barGap: 15,
-                    smooth: false,
-                    stack: '总量',
-                    itemStyle: {
-                        emphasis: {
-                            barBorderRadius: 0
-                        },normal: {
-                            barBorderRadius: 0,
-                            color: new echarts.graphic.LinearGradient(
-                                0, 0, 1, 0,
-                                [
-                                    {offset: 0, color: '#055fe4'},
-                                    {offset: 1, color: '#37BBF8'}
-
-                                ]
-                            )
-                        }},
-                    data:[71, 61, 58, 69, 75, 68, 72, 53, 48, 46],
-                },
-                {
-                    name:'2024年二季度',
-                    type:'bar',
-                    barWidth: 15,
-                    barGap: 15,
-                    smooth: false,
-                    stack: '总量',
-                    //itemStyle : { normal: {label : {show: true, position: 'insideRight'}}},
-                    itemStyle: {
-                        emphasis: {
-                            barBorderRadius: 0
-                        },normal: {
-                            barBorderRadius: 0,
-                            color: new echarts.graphic.LinearGradient(
-                                0, 0, 1, 0,
-                                [
-                                    {offset: 0, color: '#03a978'},
-                                    {offset: 1, color: '#2cfbbe'}
-
-                                ]
-                            )
-                        }},
-                    data:[70, 52, 58, 67, 65, 58, 45, 49, 72, 63]
-                },
-                {
-                    name:'2024年三季度',
-                    type:'bar',
-                    barWidth: 15,
-                    barGap: 15,
-                    smooth: false,
-                    stack: '总量',
-                    //itemStyle : { normal: {label : {show: true, position: 'insideRight'}}},
-                    itemStyle: {
-                        emphasis: {
-                            barBorderRadius: 0
-                        },normal: {
-                            barBorderRadius: 0,
-                            color: new echarts.graphic.LinearGradient(
-                                0, 0, 1, 0,
-                                [
-
-                                    {offset: 0, color: '#4f99ff'},
-                                    {offset: 1, color: '#55d9fa'}
-
-                                ]
-                            )
-                        }},
-                    data:[70, 52, 58, 67, 65, 58, 45, 49, 72, 63]
-                },
-                {
-                    name:'2024年四季度',
-                    type:'bar',
-                    barWidth: 15,
-                    barGap: 15,
-                    smooth: false,
-                    stack: '总量',
-                    //itemStyle : { normal: {label : {show: true, position: 'insideRight'}}},
-                    itemStyle: {
-                        emphasis: {
-                            barBorderRadius: 0
-                        },normal: {
-                            barBorderRadius: 0,
-                            color: new echarts.graphic.LinearGradient(
-                                0, 0, 1, 0,
-                                [
-                                    {offset: 0, color: '#05cbc8'},
-                                    {offset: 1, color: '#1af0ed'}
-
-                                ]
-                            )
-                        }},
-                    data:[70, 52, 58, 67, 65, 58, 45, 49, 72, 63]
-                },
-            ]
-        };
-        // 使用刚指定的配置项和数据显示图表。
-        myChart.setOption(option);
-        window.addEventListener("resize",function(){
-            myChart.resize();
-        });
-
-        /!*******4.月度计划TOP10********!/
-
-        var myChart = echarts.init(document.getElementById('echarts4'));
-        var option = {
-
-            color:["#2d4beb","#03a978",],
-            legend: {
-                y : '10%',
-                x : 'center',
-                data:['2024年一季度', '2024年二季度', '2024年三季度', '2024年四季度'],
-                itemWidth: 16,
-                itemHeight: 10,
-                itemGap: 30,
-                textStyle : {
-                    color : 'rgba(0,0,0,.5)',
-
-                }
-            },
-
-            calculable :false,
-
-
-            grid:{
-                left: '1%',
-                right: '2%',
-                bottom: '1%',
-                top: '20%',
-                containLabel: true
-            },
-
-            tooltip : {
-                trigger: 'axis',
-                axisPointer : {
-                    type : 'shadow'
-                }
-            },
-
-
-            xAxis : [
-                {
-                    type : 'category',
-                    data:['执法部门1', '执法部门2', '执法部门3', '执法部门4', '执法部门5', '执法部门6', '执法部门7', '执法部门8', '执法部门9', '执法部门10'],
-                    axisLabel: {
-                        show: true,
-                        rotate: '30',
-                        textStyle: {
-                            color: 'rgba(0,0,0,.5)'
-                        }
-                    },
-                    splitLine:{
-                        lineStyle:{
-                            width:0,
-                            type:'solid'
-                        }
-                    },
-                    inverse: 'true',
-                    axisLine: {
-                        show: false,
-                    },
-                    axisTick: {
-                        show: false
-                    }
-                }
-            ],
-
-
-            yAxis : [
-                {
-                    type : 'value',
-                    axisLabel: {
-                        show: true,
-                        textStyle: {
-                            color: 'rgba(0,0,0,.5)'
-                        },
-                        /!*formatter: (value) => {
-                            const list = ['差', '较差', '','较好','', '好']
-                            return list[value/20]
-                        }*!/
-                    },
-
-                    splitLine:{
-                        lineStyle:{
-                            color:['#f2f2f2'],
-                            width:0,
-                            type:'solid',
-                        }
-                    },
-                    axisLine: {
-                        show: false,
-                    },
-                    axisTick: {
-                        show: false
-                    }
-                }
-            ],
-
-            series : [
-                {
-                    name:'2024年1月',
-                    type:'bar',
-                    barGap: '-5%',
-                    barWidth: 15,
-                    smooth: false,
-                    stack: '一季度',
-                    itemStyle: {
-                        emphasis: {
-                            barBorderRadius: 0
-                        },normal: {
-                            barBorderRadius: 0,
-                            color: new echarts.graphic.LinearGradient(
-                                0, 0, 1, 0,
-                                [
-                                    {offset: 0, color: '#074197'},
-                                    {offset: 1, color: '#1f74f1'}
-
-                                ]
-                            )
-                        }},
-                    data:[71, 61, 58, 69, 75, 68, 72, 53, 48, 46],
-                },
-                {
-                    name:'2024年2月',
-                    type:'bar',
-                    barGap: '-5%',
-                    barWidth: 15,
-                    smooth: false,
-                    stack: '一季度',
-                    //itemStyle : { normal: {label : {show: true, position: 'insideRight'}}},
-                    itemStyle: {
-                        emphasis: {
-                            barBorderRadius: 0
-                        },normal: {
-                            barBorderRadius: 0,
-                            color: new echarts.graphic.LinearGradient(
-                                0, 0, 1, 0,
-                                [
-                                    {offset: 0, color: '#055fe4'},
-                                    {offset: 1, color: '#37BBF8'}
-
-                                ]
-                            )
-                        }},
-                    data:[36, 42, 38, 27, 15, 31, 25, 19, 22, 43]
-                },
-                {
-                    name:'2024年3月',
-                    type:'bar',
-                    barGap: '-5%',
-                    barWidth: 15,
-                    smooth: false,
-                    stack: '一季度',
-                    //itemStyle : { normal: {label : {show: true, position: 'insideRight'}}},
-                    itemStyle: {
-                        emphasis: {
-                            barBorderRadius: 0
-                        },normal: {
-                            barBorderRadius: 0,
-                            color: new echarts.graphic.LinearGradient(
-                                0, 0, 1, 0,
-                                [
-                                    {offset: 0, color: '#0164eb'},
-                                    {offset: 1, color: '#c3dcfe'}
-
-                                ]
-                            )
-                        }},
-                    data:[40, 32, 28, 27, 35, 28, 25, 39, 42, 33]
-                },
-                {
-                    name:'2024年4月',
-                    type:'bar',
-                    barGap: '-5%',
-                    barWidth: 15,
-                    smooth: false,
-                    stack: '二季度',
-                    itemStyle: {
-                        emphasis: {
-                            barBorderRadius: 0
-                        },normal: {
-                            barBorderRadius: 0,
-                            color: new echarts.graphic.LinearGradient(
-                                0, 0, 1, 0,
-                                [
-                                    {offset: 0, color: '#238065'},
-                                    {offset: 1, color: '#07d398'}
-
-                                ]
-                            )
-                        }},
-                    data:[36, 31, 28, 29, 25, 28, 22, 23, 38, 36],
-                },
-                {
-                    name:'2024年5月',
-                    type:'bar',
-                    barGap: '-5%',
-                    barWidth: 15,
-                    smooth: false,
-                    stack: '二季度',
-                    //itemStyle : { normal: {label : {show: true, position: 'insideRight'}}},
-                    itemStyle: {
-                        emphasis: {
-                            barBorderRadius: 0
-                        },normal: {
-                            barBorderRadius: 0,
-                            color: new echarts.graphic.LinearGradient(
-                                0, 0, 1, 0,
-                                [
-                                    {offset: 0, color: '#0fa97c'},
-                                    {offset: 1, color: '#01d899'}
-
-                                ]
-                            )
-                        }},
-                    data:[64, 72, 68, 67, 65, 78, 75, 69, 57, 81]
-                },
-                {
-                    name:'2024年6月',
-                    type:'bar',
-                    barGap: '-5%',
-                    barWidth: 15,
-                    smooth: false,
-                    stack: '二季度',
-                    //itemStyle : { normal: {label : {show: true, position: 'insideRight'}}},
-                    itemStyle: {
-                        emphasis: {
-                            barBorderRadius: 0
-                        },normal: {
-                            barBorderRadius: 0,
-                            color: new echarts.graphic.LinearGradient(
-                                0, 0, 1, 0,
-                                [
-                                    {offset: 0, color: '#02ca90'},
-                                    {offset: 1, color: '#05fab3'}
-
-                                ]
-                            )
-                        }},
-                    data:[50, 52, 84, 73, 53, 58, 44, 49, 62, 63]
-                },
-
-                {
-                    name:'2024年7月',
-                    type:'bar',
-                    barGap: '-5%',
-                    barWidth: 15,
-                    smooth: false,
-                    stack: '三季度',
-                    itemStyle: {
-                        emphasis: {
-                            barBorderRadius: 0
-                        },normal: {
-                            barBorderRadius: 0,
-                            color: new echarts.graphic.LinearGradient(
-                                0, 0, 1, 0,
-                                [
-                                    {offset: 0, color: '#036291'},
-                                    {offset: 1, color: '#50a1ff'}
-
-                                ]
-                            )
-                        }},
-                    data:[71, 61, 58, 69, 75, 68, 72, 53, 48, 46],
-                },
-                {
-                    name:'2024年8月',
-                    type:'bar',
-                    barGap: '-5%',
-                    barWidth: 15,
-                    smooth: false,
-                    stack: '三季度',
-                    //itemStyle : { normal: {label : {show: true, position: 'insideRight'}}},
-                    itemStyle: {
-                        emphasis: {
-                            barBorderRadius: 0
-                        },normal: {
-                            barBorderRadius: 0,
-                            color: new echarts.graphic.LinearGradient(
-                                0, 0, 1, 0,
-                                [
-                                    {offset: 0, color: '#046a9d'},
-                                    {offset: 1, color: '#3cc9fe'}
-
-                                ]
-                            )
-                        }},
-                    data:[70, 52, 58, 67, 65, 58, 45, 49, 72, 63]
-                },
-                {
-                    name:'2024年9月',
-                    type:'bar',
-                    barGap: '-5%',
-                    barWidth: 15,
-                    smooth: false,
-                    stack: '三季度',
-                    //itemStyle : { normal: {label : {show: true, position: 'insideRight'}}},
-                    itemStyle: {
-                        emphasis: {
-                            barBorderRadius: 0
-                        },normal: {
-                            barBorderRadius: 0,
-                            color: new echarts.graphic.LinearGradient(
-                                0, 0, 1, 0,
-                                [
-                                    {offset: 0, color: '#1391c6'},
-                                    {offset: 1, color: '#6dd3fe'}
-
-                                ]
-                            )
-                        }},
-                    data:[70, 52, 58, 67, 65, 58, 45, 49, 72, 63]
-                },
-
-                {
-                    name:'2024年10月',
-                    type:'bar',
-                    barGap: '-5%',
-                    barWidth: 15,
-                    smooth: false,
-                    stack: '四季度',
-                    itemStyle: {
-                        emphasis: {
-                            barBorderRadius: 0
-                        },normal: {
-                            barBorderRadius: 0,
-                            color: new echarts.graphic.LinearGradient(
-                                0, 0, 1, 0,
-                                [
-                                    {offset: 0, color: '#083f8a'},
-                                    {offset: 1, color: '#0df2f1'}
-
-                                ]
-                            )
-                        }},
-                    data:[61, 52, 58, 69, 75, 68, 72, 53, 48, 56],
-                },
-                {
-                    name:'2024年11月',
-                    type:'bar',
-                    barGap: '-5%',
-                    barWidth: 15,
-                    smooth: false,
-                    stack: '四季度',
-                    //itemStyle : { normal: {label : {show: true, position: 'insideRight'}}},
-                    itemStyle: {
-                        emphasis: {
-                            barBorderRadius: 0
-                        },normal: {
-                            barBorderRadius: 0,
-                            color: new echarts.graphic.LinearGradient(
-                                0, 0, 1, 0,
-                                [
-                                    {offset: 0, color: '#096aa3'},
-                                    {offset: 1, color: '#0cd7d4'}
-
-                                ]
-                            )
-                        }},
-                    data:[72, 71, 78, 77, 65, 68, 55, 59, 72, 63]
-                },
-                {
-                    name:'2024年12月',
-                    type:'bar',
-                    barGap: '-5%',
-                    barWidth: 15,
-                    smooth: false,
-                    stack: '四季度',
-                    //itemStyle : { normal: {label : {show: true, position: 'insideRight'}}},
-                    itemStyle: {
-                        emphasis: {
-                            barBorderRadius: 0
-                        },normal: {
-                            barBorderRadius: 0,
-                            color: new echarts.graphic.LinearGradient(
-                                0, 0, 1, 0,
-                                [
-                                    {offset: 0, color: '#2790a6'},
-                                    {offset: 1, color: '#1df1e5'}
-
-                                ]
-                            )
-                        }},
-                    data:[80, 82, 88, 87, 85, 88, 75, 79, 72, 73]
-                },
-
-            ]
-        };
-        // 使用刚指定的配置项和数据显示图表。
-        myChart.setOption(option);
-        window.addEventListener("resize",function(){
-            myChart.resize();
-        });*/
     </script>
 </body>
 </html>
\ No newline at end of file
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/staticRegistration.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/staticRegistration.html
index b2d6df73..d506c916 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/staticRegistration.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/staticRegistration.html
@@ -480,8 +480,8 @@
             }
             if($('#dateSearch').val()=="select-time"){
                 if($('#startTime').val()==null||$('#startTime').val()==""){
-                    params.startTime="2024-08-24";
-                    beginDate=new Date("2024-08-24");
+                    params.startTime="2024-08-14";
+                    beginDate=new Date("2024-08-14");
                 }else{
                     endDate=new Date($('#startTime').val());
                 }
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/ComplaintStaticController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/ComplaintStaticController.java
index 9b98fc89..c28d94cf 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/ComplaintStaticController.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/ComplaintStaticController.java
@@ -92,27 +92,6 @@ public class ComplaintStaticController extends BaseController {
         return prefix+"/complaintA";
     }*/
     public String searchType1(ComplaintStatistics complaintStatistics,Model model){
-        if(complaintStatistics.getTimeType().equals("month")){
-            model.addAttribute("selectTime",complaintStatistics.getYear()+'年'+complaintStatistics.getMonth()+"月");
-        }else if(complaintStatistics.getTimeType().equals("quarter")){
-            model.addAttribute("selectTime",complaintStatistics.getYear()+"年第"+complaintStatistics.getQuarter()+"季");
-        }else if(complaintStatistics.getTimeType().equals("year")){
-            model.addAttribute("selectTime",complaintStatistics.getYear()+'年');
-        }else if(complaintStatistics.getTimeType().equals("day")){
-            if(complaintStatistics.getBeginTime()!=null&&!complaintStatistics.equals("")){
-                if(complaintStatistics.getBeginTime()!=null&&!complaintStatistics.equals("")){
-                    model.addAttribute("selectTime",complaintStatistics.getBeginTime()+"~"+complaintStatistics.getEndTime());
-                }else {
-                    model.addAttribute("selectTime",complaintStatistics.getBeginTime()+"~至今");
-                }
-            }else {
-                if(complaintStatistics.getBeginTime()!=null&&!complaintStatistics.equals("")){
-                    model.addAttribute("selectTime","~"+complaintStatistics.getEndTime());
-                }else {
-                    model.addAttribute("selectTime","");
-                }
-            }
-        }
         Map<String, Dept> deptMap=new HashMap<>();
 /*        if(complaintStatistics.getComplaintDepartment()!=null&&!"".equals(complaintStatistics.getComplaintDepartment())){//搜索条件内有投诉对象时
             List<Dept> deptList=iDeptService.selectDeptByDeptName(complaintStatistics.getComplaintDepartment());
@@ -138,25 +117,25 @@ public class ComplaintStaticController extends BaseController {
 
     /**
      * 投诉类型统计--返回切片值
-     * @param searchType
+     * @param complaintStatistics
      * @param model
      * @return
      */
     @RequiresPermissions("code:complaintStatic:list")
     @GetMapping("/searchType2")
-    public String searchType2(SearchType searchType,Model model){
-        model.addAttribute("year",searchType.getYear());
-        ComplaintStatistics complaintStatistics=dateMake(searchType);
+    public String searchType2(ComplaintStatistics complaintStatistics,Model model){
+//        model.addAttribute("year",searchType.getYear());
+//        ComplaintStatistics complaintStatistics=dateMake(searchType);
         List<ComplaintStatistics> complaintStatisticsList =new ArrayList<>();
         List<ComplaintStatistics> complaintStatisticsAllList =new ArrayList<>();
         //当类型查看为全市和投诉类型时，投诉总数一致
-        if(StrUtil.hasEmpty(searchType.getQy()) || searchType.getQy().equals("type")) {
+        if(StrUtil.hasEmpty(complaintStatistics.getType()) || complaintStatistics.getType().equals("type")) {
             //待权限1209
             complaintStatisticsList = complaintStatisticsService.selectComplaintStatisticsList(complaintStatistics);
             complaintStatisticsAllList=complaintStatisticsList;
         }else{
             //当类型查看某区域时
-            String qy=dictDataMapper.selectDictLabel("address_type",searchType.getQy());
+            String qy=dictDataMapper.selectDictLabel("address_type",complaintStatistics.getType());
             //待权限1209
             complaintStatisticsList=complaintStatisticsService.selectComplaintStatisticsLEFTEnterpriseList(complaintStatistics)
                     .stream()
@@ -214,8 +193,8 @@ public class ComplaintStaticController extends BaseController {
     @RequiresPermissions("code:complaintStatic:list")
     @PostMapping("/list2")
     @ResponseBody
-    public TableDataInfo complaint2(SearchType searchType) {
-        ComplaintStatistics complaintStatistics=dateMake(searchType);
+    public TableDataInfo complaint2(ComplaintStatistics complaintStatistics) {
+//        ComplaintStatistics complaintStatistics=dateMake(searchType);
         List<ComplaintStatistics> complaintStatisticsList=complaintStatisticsService.selectComplaintStatisticsList(complaintStatistics);//权限
         return getDataTable(complaintStatisticsService.type(complaintStatisticsList));
     }
@@ -229,9 +208,10 @@ public class ComplaintStaticController extends BaseController {
     }
     @GetMapping("/export1")
     @ResponseBody
-    public void export1(HttpServletResponse httpServletResponse,SearchType searchType) throws IOException {
-        ComplaintStatistics complaintStatistics=dateMake(searchType);
-        List<ComplaintStatistics> complaintStatisticsList=complaintStatisticsService.list1(searchType,complaintStatistics);
+    public void export1(HttpServletResponse httpServletResponse,ComplaintStatistics complaintStatistics) throws IOException {
+/*        ComplaintStatistics complaintStatistics=dateMake(searchType);
+        List<ComplaintStatistics> complaintStatisticsList=complaintStatisticsService.list1(searchType,complaintStatistics);*/
+        List<ComplaintStatistics> complaintStatisticsList=complaintStatisticsService.selectComplaintStatisticsListGroupDeptList(complaintStatistics);
         HSSFWorkbook workbook = new HSSFWorkbook();
         HSSFSheet sheet = workbook.createSheet("执法投诉统计");
         //设置文件名称
@@ -281,8 +261,8 @@ public class ComplaintStaticController extends BaseController {
 
     @GetMapping("/export2")
     @ResponseBody
-    public void export2(HttpServletResponse httpServletResponse,SearchType searchType) throws IOException {
-        ComplaintStatistics complaintStatistics=dateMake(searchType);
+    public void export2(HttpServletResponse httpServletResponse,ComplaintStatistics complaintStatistics) throws IOException {
+//        ComplaintStatistics complaintStatistics=dateMake(searchType);
         List<ComplaintStatistics> complaintStatisticsList=complaintStatisticsService.selectComplaintStatisticsList(complaintStatistics);//权限
         List<StatisticsIndicator> statisticsIndicatorList=complaintStatisticsService.type(complaintStatisticsList);
         HSSFWorkbook workbook = new HSSFWorkbook();
@@ -334,10 +314,10 @@ public class ComplaintStaticController extends BaseController {
     }
     @GetMapping("/export3")
     @ResponseBody
-    public void export3(HttpServletResponse httpServletResponse,SearchType searchType) throws IOException {
-        ComplaintStatistics complaintStatistics=dateMake(searchType);
+    public void export3(HttpServletResponse httpServletResponse,ComplaintStatistics complaintStatistics) throws IOException {
+//        ComplaintStatistics complaintStatistics=dateMake(searchType);
         List<ComplaintStatistics> complaintStatisticsList=complaintStatisticsService.selectComplaintStatisticsLEFTEnterpriseList(complaintStatistics);//权限
-        List<StatisticsIndicator> statisticsIndicatorList=complaintStatisticsService.qyComplaintList(complaintStatisticsList,searchType);
+        List<StatisticsIndicator> statisticsIndicatorList=complaintStatisticsService.qyComplaintList(complaintStatisticsList,complaintStatistics);
         HSSFWorkbook workbook = new HSSFWorkbook();
         HSSFSheet sheet = workbook.createSheet("投诉企业所属区域统计");
         //设置文件名称
@@ -387,10 +367,10 @@ public class ComplaintStaticController extends BaseController {
     }
     @GetMapping("/export4")
     @ResponseBody
-    public void export4(HttpServletResponse httpServletResponse,SearchType searchType) throws IOException {
-        ComplaintStatistics complaintStatistics=dateMake(searchType);
+    public void export4(HttpServletResponse httpServletResponse,ComplaintStatistics complaintStatistics) throws IOException {
+//        ComplaintStatistics complaintStatistics=dateMake(searchType);
         List<ComplaintStatistics> complaintStatisticsList=complaintStatisticsService.selectComplaintStatisticsLEFTEnterpriseList(complaintStatistics);//权限
-        List<StatisticsIndicator> statisticsIndicatorList=complaintStatisticsService.jdComplaintList(complaintStatisticsList,searchType);
+        List<StatisticsIndicator> statisticsIndicatorList=complaintStatisticsService.jdComplaintList(complaintStatisticsList,complaintStatistics);
         HSSFWorkbook workbook = new HSSFWorkbook();
         HSSFSheet sheet = workbook.createSheet("投诉企业所属街道统计");
         //设置文件名称
@@ -495,18 +475,18 @@ public class ComplaintStaticController extends BaseController {
     @RequiresPermissions("code:complaintStatic:list")
     @PostMapping("/qyComplaintList")
     @ResponseBody
-    public TableDataInfo qyComplaintList(SearchType searchType) {
-        ComplaintStatistics complaintStatistics=dateMake(searchType);
+    public TableDataInfo qyComplaintList(ComplaintStatistics complaintStatistics) {
+//        ComplaintStatistics complaintStatistics=dateMake(searchType);
         List<ComplaintStatistics> complaintStatisticsList=complaintStatisticsService.selectComplaintStatisticsLEFTEnterpriseList(complaintStatistics);//权限
-        return getDataTable(complaintStatisticsService.qyComplaintList(complaintStatisticsList,searchType));
+        return getDataTable(complaintStatisticsService.qyComplaintList(complaintStatisticsList,complaintStatistics));
     }
     @RequiresPermissions("code:complaintStatic:list")
     @PostMapping("/jdComplaintList")
     @ResponseBody
-    public TableDataInfo jdComplaintList(SearchType searchType) {
-        ComplaintStatistics complaintStatistics=dateMake(searchType);
+    public TableDataInfo jdComplaintList(ComplaintStatistics complaintStatistics) {
+//        ComplaintStatistics complaintStatistics=dateMake(searchType);
         List<ComplaintStatistics> complaintStatisticsList=complaintStatisticsService.selectComplaintStatisticsLEFTEnterpriseList(complaintStatistics);//权限
-        return getDataTable(complaintStatisticsService.jdComplaintList(complaintStatisticsList,searchType));
+        return getDataTable(complaintStatisticsService.jdComplaintList(complaintStatisticsList,complaintStatistics));
     }
     @GetMapping("/details/{id}")
     public String complaintsReportDetails(@PathVariable("id") String id, Model model) {
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 b003a400..941266a2 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
@@ -21,6 +21,7 @@ import com.zdxt.code.domain.EnterpriseLawEnforcement;
 import com.zdxt.code.domain.LinkageDict;
 import com.zdxt.code.domain.dto.EnforcementRegistrationDto;
 import com.zdxt.code.domain.*;
+import com.zdxt.code.mapper.EnforcementRegistrationMapper;
 import com.zdxt.code.service.EnforcementCheckStatisticsService;
 import com.zdxt.code.service.ILinkageDictService;
 import com.zdxt.common.ZDResponse;
@@ -67,6 +68,8 @@ public class EnforcementRegistrationController extends BaseController
     @Autowired
     private EnforcementCheckStatisticsService enforcementCheckStatisticsService;
     @Autowired
+    private EnforcementRegistrationMapper enforcementRegistrationMapper;
+    @Autowired
     private DictDataMapper dictDataMapper;
 
     @RequiresPermissions("code:registration:view")
@@ -85,7 +88,7 @@ public class EnforcementRegistrationController extends BaseController
         List<EnforcementRegistration> uniteList=list.stream().filter(item->item.getUniteCheck()!=null&&!"".equals(item.getUniteCheck())).collect(Collectors.toList());
         List<EnforcementRegistration> checkList=list.stream().filter(item->item.getCheckCategory()!=null&&!"".equals(item.getCheckCategory())&&item.getCheckCategory().equals("01")).collect(Collectors.toList());
         String checkName=iDictDataService.selectDictLabel("check_category","01");
-        model.addAttribute("year",localDate.getYear());
+//        model.addAttribute("year",localDate.getYear());
         model.addAttribute("yearList",yearMake());
         model.addAttribute("total",list.size());
         model.addAttribute("unite",uniteList.size());
@@ -293,11 +296,11 @@ public class EnforcementRegistrationController extends BaseController
             enforcementRegistration.setQy(iDictDataService.selectDictLabel("address_Type",enforcementRegistration.getQy()));
         }
         DecimalFormat str1=new DecimalFormat("0.00%");
-        if(enforcementRegistration.getYear()==null||"".equals(enforcementRegistration.getYear())) {
-            model.addAttribute("year","-");
-        }else {
-            model.addAttribute("year", enforcementRegistration.getYear());
-        }
+//        if(enforcementRegistration.getYear()==null||"".equals(enforcementRegistration.getYear())) {
+//            model.addAttribute("year","-");
+//        }else {
+//            model.addAttribute("year", enforcementRegistration.getYear());
+//        }
         List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationAndAddressList(enforcementRegistration);
         System.out.println(1);
         List<EnforcementRegistration> uniteList=list.stream().filter(item->item.getUniteCheck()!=null&&!"".equals(item.getUniteCheck())).collect(Collectors.toList());
@@ -343,7 +346,9 @@ public class EnforcementRegistrationController extends BaseController
     public List<StatisticsIndicator> echarts1(EnforcementRegistration enforcementRegistration){
         List<StatisticsIndicator> statisticsIndicatorList=new ArrayList<>();
         Map<String,DictData> dictDataMap=iDictDataService.selectDictDataByType("check_category").stream().collect(Collectors.toMap(DictData::getDictValue,Function.identity()));
-        List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationList1(enforcementRegistration);
+//        List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationList1(enforcementRegistration);
+        List<EnforcementRegistration> list =
+                enforcementRegistrationMapper.selectEnforcementRegistrationList1(enforcementRegistration);
         Map<String,Long> checkMap=list.stream().collect(Collectors.groupingBy(item->item.getCheckCategory()==null||"".equals(item.getCheckCategory())?"空":item.getCheckCategory(),Collectors.counting()));
         for(String s:checkMap.keySet()){
             StatisticsIndicator statisticsIndicator=new StatisticsIndicator();
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/ComplaintStatistics.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/ComplaintStatistics.java
index 03f6ce44..2d6c24ee 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/ComplaintStatistics.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/ComplaintStatistics.java
@@ -45,6 +45,7 @@ public class ComplaintStatistics extends BaseDomain {
     private String year;
     private String quarter;
     private String month;
+    private String type;
 
     public String getId() {
         return id;
@@ -277,4 +278,12 @@ public class ComplaintStatistics extends BaseDomain {
     public void setMonth(String month) {
         this.month = month;
     }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
 }
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/ComplaintStatisticsService.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/ComplaintStatisticsService.java
index 300a3d74..8579b33e 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/ComplaintStatisticsService.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/ComplaintStatisticsService.java
@@ -21,9 +21,9 @@ public interface ComplaintStatisticsService {
 
     List<StatisticsIndicator> type(List<ComplaintStatistics> complaintStatisticsList);
 
-    List<StatisticsIndicator> qyComplaintList(List<ComplaintStatistics> complaintStatisticsList,SearchType searchType);
+    List<StatisticsIndicator> qyComplaintList(List<ComplaintStatistics> complaintStatisticsList,ComplaintStatistics complaintStatistics);
 
-    List<StatisticsIndicator> jdComplaintList(List<ComplaintStatistics> complaintStatisticsList,SearchType searchType);
+    List<StatisticsIndicator> jdComplaintList(List<ComplaintStatistics> complaintStatisticsList,ComplaintStatistics complaintStatistics);
 
     List<ComplaintStatistics> list1(SearchType searchType, ComplaintStatistics complaintStatistics);
     List<ComplaintStatistics> selectComplaintStatisticsListGroupDeptList(ComplaintStatistics complaintStatistics);
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ComplaintStatisticsImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ComplaintStatisticsImpl.java
index e656a32a..8cc27cbd 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ComplaintStatisticsImpl.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ComplaintStatisticsImpl.java
@@ -162,7 +162,7 @@ public class ComplaintStatisticsImpl implements ComplaintStatisticsService {
         return list;
     }
     @Override
-    public List<StatisticsIndicator> qyComplaintList(List<ComplaintStatistics> complaintStatisticsList, SearchType searchType){
+    public List<StatisticsIndicator> qyComplaintList(List<ComplaintStatistics> complaintStatisticsList, ComplaintStatistics complaintStatistics){
         List<DictData> dictDataList=dictDataMapper.selectDictDataByType("address_type");
         List<StatisticsIndicator> statisticsIndicatorList=new ArrayList<>();
         List<ComplaintStatistics> fitterNullList=complaintStatisticsList.stream().filter(item -> !StrUtil.hasEmpty(item.getEnterpriseAddress())).collect(Collectors.toList());
@@ -188,9 +188,9 @@ public class ComplaintStatisticsImpl implements ComplaintStatisticsService {
         return statisticsIndicatorList;
     }
     @Override
-    public List<StatisticsIndicator> jdComplaintList(List<ComplaintStatistics> complaintStatisticsList, SearchType searchType){
-        String qy=dictDataMapper.selectDictLabel("address_type",searchType.getQy());
-        List<DictData> dictDataList=dictDataMapper.selectDictDataByType(searchType.getQy());
+    public List<StatisticsIndicator> jdComplaintList(List<ComplaintStatistics> complaintStatisticsList, ComplaintStatistics complaintStatistics){
+        String qy=dictDataMapper.selectDictLabel("address_type",complaintStatistics.getType());
+        List<DictData> dictDataList=dictDataMapper.selectDictDataByType(complaintStatistics.getType());
         List<StatisticsIndicator> statisticsIndicatorList=new ArrayList<>();
         complaintStatisticsList=complaintStatisticsList.stream().filter(item -> (!StrUtil.hasEmpty(item.getEnterpriseAddress()))&&(item.getEnterpriseAddress().startsWith("深圳市" + qy.substring(0, qy.indexOf("区")) + "区") || item.getEnterpriseAddress().startsWith("深圳市" + qy.substring(0, qy.indexOf("区")) + "新区"))).collect(Collectors.toList());
         List<ComplaintStatistics> complaintStatisticsAfterList=complaintStatisticsList;
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java
index 3cb74856..859ffd52 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java
@@ -972,10 +972,14 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
                         }else {
                             second.add(uniteMap.get(false).get(i));
                         }
+                    }else{//避免丢数据
+                        firstList.add(uniteMap.get(false).get(i));
                     }
-
+                }else{//避免丢数据
+                    firstList.add(uniteMap.get(false).get(i));
                 }
             }
+            //让牵头单位在前
             list=firstList;
             list.addAll(second);
         }
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/ComplaintStatisticsMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/ComplaintStatisticsMapper.xml
index f66faf7a..2cd0b147 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/ComplaintStatisticsMapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/ComplaintStatisticsMapper.xml
@@ -47,16 +47,14 @@
                 and DATE_FORMAT(complaint_time,'%Y-%m-%d') &lt;= STR_TO_DATE(#{endTime},'%Y-%m-%d')
             </if>
             <if test="enterpriseAddress != null and enterpriseAddress != ''">and enterprise_address like concat('%',#{enterpriseAddress},'%')</if>
-            <if test="timeType != null and timeType != '' and timeType == 'month'"> and YEAR(complaint_time)=#{year} and MONTH(complaint_time)=#{month}</if>
-            <if test="timeType != null and timeType != '' and timeType == 'quarter'"> and YEAR(complaint_time)=#{year} and QUARTER(complaint_time)=#{quarter}</if>
-            <if test="timeType != null and timeType != '' and timeType == 'year'"> and YEAR(complaint_time)=#{year}</if>
-            <if test="timeType != null and timeType != '' and timeType == 'day'">
-                <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
-                    and DATE_FORMAT(complaint_time,'%Y-%m-%d') &gt;= STR_TO_DATE(#{beginTime},'%Y-%m-%d')
-                </if>
-                <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
-                    and DATE_FORMAT(complaint_time,'%Y-%m-%d') &lt;= STR_TO_DATE(#{endTime},'%Y-%m-%d')
-                </if>
+            <if test="year != null and year != ''">
+                and YEAR(complaint_time)=#{year}
+            </if>
+            <if test="quarter != null and quarter != ''">
+                and QUARTER(complaint_time)=#{quarter}
+            </if>
+            <if test="month != null and month != ''">
+                and MONTH(complaint_time)=#{month}
             </if>
         </where>
         order by complaint_time desc
@@ -75,6 +73,15 @@
             <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
                 and DATE_FORMAT(c.complaint_time,'%Y-%m-%d') &lt;= STR_TO_DATE(#{endTime},'%Y-%m-%d')
             </if>
+            <if test="year != null and year != ''">
+                and YEAR(c.complaint_time)=#{year}
+            </if>
+            <if test="quarter != null and quarter != ''">
+                and QUARTER(c.complaint_time)=#{quarter}
+            </if>
+            <if test="month != null and month != ''">
+                and MONTH(c.complaint_time)=#{month}
+            </if>
         </where>
     </select>
     <select id="selectComplaintStatisticsGroup" parameterType="ComplaintStatistics" resultMap="ComplaintStatisticsResult">
@@ -98,16 +105,14 @@
                 and DATE_FORMAT(complaint_time,'%Y-%m-%d') &lt;= STR_TO_DATE(#{endTime},'%Y-%m-%d')
             </if>
             <if test="enterpriseAddress != null and enterpriseAddress != ''">and enterprise_address like concat('%',#{enterpriseAddress},'%')</if>
-            <if test="timeType != null and timeType != '' and timeType == 'month'"> and YEAR(complaint_time)=#{year} and MONTH(complaint_time)=#{month}</if>
-            <if test="timeType != null and timeType != '' and timeType == 'quarter'"> and YEAR(complaint_time)=#{year} and QUARTER(complaint_time)=#{quarter}</if>
-            <if test="timeType != null and timeType != '' and timeType == 'year'"> and YEAR(complaint_time)=#{year}</if>
-            <if test="timeType != null and timeType != '' and timeType == 'day'">
-                <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
-                    and DATE_FORMAT(complaint_time,'%Y-%m-%d') &gt;= STR_TO_DATE(#{beginTime},'%Y-%m-%d')
-                </if>
-                <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
-                    and DATE_FORMAT(complaint_time,'%Y-%m-%d') &lt;= STR_TO_DATE(#{endTime},'%Y-%m-%d')
-                </if>
+            <if test="year != null and year != ''">
+                and YEAR(complaint_time)=#{year}
+            </if>
+            <if test="quarter != null and quarter != ''">
+                and QUARTER(complaint_time)=#{quarter}
+            </if>
+            <if test="month != null and month != ''">
+                and MONTH(complaint_time)=#{month}
             </if>
             group by complaint_department_id
             order by total desc
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
index 2d34c261..c6118aef 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
@@ -205,6 +205,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
                 and DATE_FORMAT(create_time,'%Y-%m-%d') &lt;= STR_TO_DATE(#{endTime},'%Y-%m-%d')
             </if>
+            <if test="year != null and year != ''">
+                AND YEAR(create_time) = #{year}
+            </if>
+            <if test="quarter != null and quarter != '' ">
+                AND QUARTER(create_time) = #{quarter}
+            </if>
+            <if test="month != null and month != '' ">
+                AND DATE_FORMAT(create_time, '%m') = #{month}
+            </if>
             <choose>
                 <when test="params.dataScope != null and params.dataScope != ''">
                     and  dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = #{deptId} or find_in_set( #{deptId} , ancestors ) <![CDATA[ <> ]]> 0 )
