From 8a560848b3e47947e70af07198f27bd16a913c67 Mon Sep 17 00:00:00 2001
From: zouyx <1798599149@qq.com>
Date: Fri, 9 May 2025 18:59:56 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E7=9D=A3=E7=AB=AF-=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=BB=9F=E8=AE=A1=E4=BF=AE=E6=94=B9=EF=BC=88?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=9B=B8=E5=85=B3=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../code/statistical/staticProgram.html       | 99 +++++++++++++++++--
 .../EnforcementInspectionProgramMapper.xml    | 10 +-
 2 files changed, 97 insertions(+), 12 deletions(-)

diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/staticProgram.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/staticProgram.html
index 47194eed..002b8677 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/staticProgram.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/staticProgram.html
@@ -72,13 +72,14 @@
                                             <option value="year">年度</option>
                                             <option value="quarter">季度</option>
                                             <option value="month">月度</option>
+                                            <option value="day">自定义时间</option>
                                         </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>
@@ -96,6 +97,12 @@
                                             <option value="12">12月</option>
                                         </select>
                                     </li>
+                                    <li id="day" class="day" style="display: flex;">
+                                        <p>自定义时间：</p>
+                                        <input type="text" class="time-input" id="beginTime" placeholder="开始时间" name="beginTime" style="width: 100px"/>
+                                        <span>-</span>
+                                        <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="endTime" style="width: 100px"/>
+                                    </li>
                                     <li>
                                         <a class="btn btn-success btn-sm" onclick="query()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                                         <a class="btn btn-reset btn-sm" onclick="resetP()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
@@ -105,7 +112,7 @@
                                 <div class="static-content">
                                     <ul>
                                         <li id="b">
-                                            <p><span id="yearDate"></span>:</p>
+                                            <p><span id="timeString"></span>:</p>
                                             <p><label>计划总数</label><b><span id="total">0</span></b></p>
                                             <p><label>年度计划</label><b><span id="yearTotal">0</span></b></p>
                                             <p><label>季度计划</label><b><span id="quarterTotal">0</span></b></p>
@@ -177,7 +184,8 @@
         $("#monthDom").hide();*/
         $("#quarter").hide();
         $("#month").hide();
-        $("#select-time").hide();
+        $("#day").hide();
+        // $("#select-time").hide();
         $("#chart-box-1").hide();
         $("#chart-box-2").hide();
         $("#chart-box-3").hide();
@@ -225,7 +233,41 @@
                     $("#quarterTotal").text(0);
                     $("#monthTotal").text(0);
                 }
-                $("#yearDate").text(document.getElementById("year").value)
+                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("~");
+                    }
+                }
             },
             error: function (er) {          //失败，回调函数
             }
@@ -462,15 +504,58 @@
     function timeType() {
         var dateSearch = document.getElementById("dateSearch");
         console.log(dateSearch.value);
+/*        if(dateSearch.value=="quarter"){
+            $("#quarter").show();
+            $("#month").hide();
+            document.getElementById("month").value="";
+        }else if(dateSearch.value=="month"){
+            $("#quarter").hide();
+            document.getElementById("quarter").value="";
+            $("#month").show();
+        }else {
+            $("#quarter").hide();
+            document.getElementById("quarter").value="";
+            $("#month").hide();
+            document.getElementById("month").value="";
+        }*/
         if(dateSearch.value=="quarter"){
+            $("#year").show();
+            if(document.getElementById("year").value==''){
+                document.getElementById("year").value=document.getElementById("year").options[0].value;
+            }
+            $("#day").hide();
+            document.getElementById("beginTime").value="";
+            document.getElementById("endTime").value="";
             $("#quarter").show();
             $("#month").hide();
             document.getElementById("month").value="";
         }else if(dateSearch.value=="month"){
+            $("#year").show();
+            if(document.getElementById("year").value==''){
+                document.getElementById("year").value=document.getElementById("year").options[0].value;
+            }
+            $("#day").hide();
+            document.getElementById("beginTime").value="";
+            document.getElementById("endTime").value="";
             $("#quarter").hide();
             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="";
+            $("#month").hide();
+            document.getElementById("month").value="";
         }else {
+            $("#year").show();
+            if(document.getElementById("year").value==''){
+                document.getElementById("year").value=document.getElementById("year").options[0].value;
+            }
+            $("#day").hide();
+            document.getElementById("beginTime").value="";
+            document.getElementById("endTime").value="";
             $("#quarter").hide();
             document.getElementById("quarter").value="";
             $("#month").hide();
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml
index f9f18e77..cf4f29aa 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml
@@ -184,13 +184,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             FROM enforcement_inspection_program
             <where>
                 <if test="bureauDeptName != null and bureauDeptName != ''">
-                    bureau_dept_name like concat('%', #{bureauDeptName}, '%')
+                    and bureau_dept_name like concat('%', #{bureauDeptName}, '%')
                 </if>
                 <if test="beginTime != null and beginTime != ''">
-                    <![CDATA[  create_time >= concat('%', #{beginTime}, '%') ]]>
+                    and DATE_FORMAT(create_time,'%Y-%m-%d') >= #{beginTime}
                 </if>
                 <if test="endTime != null and endTime != ''">
-                    <![CDATA[  create_time <= concat('%', #{endTime}, '%') ]]>
+                    and #{endTime} >= DATE_FORMAT(create_time,'%Y-%m-%d')
                 </if>
                 <if test="year != null and year != ''">
                     and YEAR(create_time) = #{year}
@@ -220,10 +220,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 bureau_dept_name like concat('%', #{bureauDeptName}, '%')
             </if>
             <if test="beginTime != null and beginTime != ''">
-                <![CDATA[  create_time >= concat('%', #{beginTime}, '%') ]]>
+                and DATE_FORMAT(create_time,'%Y-%m-%d') >= #{beginTime}
             </if>
             <if test="endTime != null and endTime != ''">
-                <![CDATA[  create_time <= concat('%', #{endTime}, '%') ]]>
+                and #{endTime} >= DATE_FORMAT(create_time,'%Y-%m-%d')
             </if>
             <if test="year != null and year != ''">
                 and YEAR(create_time) = #{year}