From 93a5c6377f5651f9a83ae814acfe53a4e07f8a24 Mon Sep 17 00:00:00 2001
From: shil <452061493@qq.com>
Date: Fri, 29 Aug 2025 17:32:27 +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        | 71 ++++++++++++-------
 .../mapper/StatisticalPanelMapper.xml         |  4 +-
 2 files changed, 47 insertions(+), 28 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 7fb54c9b..6f2cfeac 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
@@ -121,16 +121,10 @@
     <div class="select_set">
       <div class="select_item"><span>深圳市</span>
 <!--        <label class="select_time">2025-01-01 至 2025-03-31 <a></a> </label>-->
-        <li id="select-time" class="select-time">
-          <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="beginTime"/>
-          <span>-</span>
-          <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="endTime"/>
-          <a class="btn btn-success btn-sm" onclick="search1()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-          <a class="btn btn-reset btn-sm" onclick="rest1()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-        </li>
+        <label class="select_time">时间筛选<a id="timeSelect"></a></label>
       </div>
     </div>
-    <div class="link_btn"> <a href="/code/statisticalPanel/single-analysis">各市直执法单位综合分析</a> <a href="overall-analysis">各区执法综合分析</a> </div>
+    <div class="link_btn"> <a href="/code/statisticalPanel/single-analysis">各市直执法单位综合分析</a> <a href="/code/statisticalPanel/overall-analysis">各区执法综合分析</a> </div>
     <div class="count_box">
       <div class="count_item admin">
         <div class="count_tit">
@@ -186,25 +180,20 @@
 </div>
 
 <th:block th:include="zdxtInclude :: footer" />
+<script type="text/javascript" src="/ajax/libs/layer/layer.min.js"></script>
+<script type="text/javascript" src="/ajax/libs/layui/layui.js"></script>
 <script>
-  var ctx="/"
-  var q_jc_num = 0
-  var q_njc_num = 0
+  var ctx="/";
+  var q_jc_num = 0;
+  var q_njc_num = 0;
 
   $(function(){
-    search1();
+    changeDate();
   });
 
-  function rest1() {
-    document.getElementById("startTime").value = '';
-    document.getElementById("endTime").value = '';
-    search1();
-  }
-
-  function search1() {
-    debugger;
-    let beginTime=document.getElementById("startTime").value;
-    let endTime=document.getElementById("endTime").value;
+  function changeDate(time1, time2) {
+    var beginTime = time1;
+    var endTime = time2;
     analysisEnterprisesCoordination(beginTime, endTime);
     analysis_enterprises(beginTime, endTime);
     analysis_njc_all(beginTime, endTime);
@@ -263,12 +252,11 @@
         success: function (result) {
           console.log(result)
           q_jc_num += result.data.allNum;
-          // q_njc_num += result.data.njc_num;
+          q_njc_num += result.data.njcNum;
           $("#q_jc_num").text(q_jc_num);
-          // $("#q_njc_num").text(q_njc_num);
-          console.log($("#jc_all").text() + " - "+ q_jc_num +" = "+ ($("#jc_all").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);
+          $("#s_njc_num").text($("#njc_all").text() - q_njc_num);
           switch (result.data.area) {
             case '光明区':
               let gmHtml = base_html.replaceAll("{area}", result.data.area)
@@ -1458,6 +1446,37 @@
     $(aElement).addClass("active").siblings().removeClass("active");
   }
 
+
+
+  layui.use('laydate',function(){
+    var laydate = layui.laydate;
+    laydate.render({
+      elem: "#timeSelect",// 指定元素
+      range: true, // 开启范围选择
+      format: 'yyyy-MM-dd', // 日期格式
+      min: '2019-04-14', // 最小可选日期
+      max: '2099-06-16', // 最大可选日期
+      trigger: 'click', // 选择器触发方式，可选值：click, hover等
+      done: function(value, date, endDate){ // 选择日期后的回调函数
+        //选择了清空
+        if (value ===''){
+          changeDate(null,null);
+        }
+        //选择了确定
+        if (value !==null && value !==''){
+          var month1 = 10 > date.month?"0"+date.month:date.month
+          var date1 = 10 > date.date?"0"+date.date:date.date
+          let beginTime = date.year+"-"+month1+"-"+date1
+
+          var month2 = 10 > endDate.month?"0"+endDate.month:endDate.month
+          var date2 = 10 > endDate.date?"0"+endDate.date:endDate.date
+          let endTime = endDate.year+"-"+month2+"-"+date2
+          changeDate(beginTime,endTime);
+        }
+      }
+    })
+  });
+
 /** 涉企检查趋势tab切换 */
 $(".tab_tit a").on("click", function () {
   $(this).addClass("active").siblings().removeClass("active");
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/StatisticalPanelMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/StatisticalPanelMapper.xml
index a74641dd..de4d1654 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/StatisticalPanelMapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/StatisticalPanelMapper.xml
@@ -1514,8 +1514,8 @@
                 and c.complaint_department_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId})
             </if>
             <if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or c.law_enforcer_id_two=#{userId}) </if>
-            <if test="beginTime != null and beginTime != ''"> and DATE_FORMAT(c.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') </if>
-            <if test="endTime != null and endTime != ''"> and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(c.enforcement_time,'%Y-%m-%d') </if>
+            <if test="beginTime != null and beginTime != ''"> and DATE_FORMAT(c.complaint_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') </if>
+            <if test="endTime != null and endTime != ''"> and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(c.complaint_time,'%Y-%m-%d') </if>
         </where>
     </select>
     <select id="analysis_enterprisesComplaint_rr" parameterType="SixAnalysisParams" resultType="double">