From a6070e1b44bbf9969fbcf59a3f2605462773fa52 Mon Sep 17 00:00:00 2001
From: zouyx <1798599149@qq.com>
Date: Tue, 19 Nov 2024 14:47:55 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E7=BB=9F=E8=AE=A1=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=EF=BC=8C=E6=A3=80=E6=9F=A5=E8=AE=A1=E5=88=92=E4=B8=AA?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/code/statistical/staticProgram.html      |  4 ++--
 .../mapper/EnforcementInspectionProgramMapper.xml    | 12 +++++++++---
 .../mapper/LawEnforcementWarningListMapper.xml       |  1 +
 3 files changed, 12 insertions(+), 5 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 62966c60..c4ae3f17 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
@@ -161,9 +161,9 @@
         // selectDate();
         staticAllProgram();
         /*staticProgramWithAll();*/
-        staticProgramWithYear();
+        /*staticProgramWithYear();
         staticProgramWithQuarter();
-        staticProgramWithMonth();
+        staticProgramWithMonth();*/
         //初始化默认隐藏
         /*$("#yearDom").hide();
         $("#quarterDom").hide();
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml
index af13b64d..538bd34d 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml
@@ -203,7 +203,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 </if>
                 AND bureau_dept_id is not null
                 and time_type is not null
-                and(plan_year is not null or quarter is not null or mouth is not null)
+                and plan_year is not null
+                and(quarter is not null or mouth is not null)
             </where>
         GROUP BY bureau_dept_id
         order by total desc
@@ -236,7 +237,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
             AND bureau_dept_id is not null
             and time_type is not null
-            and(plan_year is not null or quarter is not null or mouth is not null)
+            and plan_year is not null
+            and (quarter is not null or mouth is not null)
         </where>
     </select>
 
@@ -266,7 +268,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
             AND bureau_dept_id is not null
             AND time_type is not null
-            and(plan_year is not null or quarter is not null or mouth is not null)
+            and plan_year is not null
+            and (quarter is not null or mouth is not null)
         </where>
         GROUP BY bureau_dept_id
         order by total desc
@@ -302,6 +305,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         GROUP BY bureau_dept_id
         order by total desc
+        limit 10
     </select>
 
 <!--    <select id="staticProgramWithQuarter" resultType="com.zdxt.code.domain.dto.EnforcementInspectionProgramDto" >
@@ -354,6 +358,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         GROUP BY bureau_dept_id
         order by total desc
+        limit 10
     </select>
 
 <!--    <select id="staticProgramWithMonth" resultType="com.zdxt.code.domain.dto.EnforcementInspectionProgramDto" >
@@ -414,5 +419,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         GROUP BY bureau_dept_id
         order by total desc
+        limit 10
     </select>
 </mapper>
\ No newline at end of file
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/LawEnforcementWarningListMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/LawEnforcementWarningListMapper.xml
index c1077a4a..6e7b2cec 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/LawEnforcementWarningListMapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/LawEnforcementWarningListMapper.xml
@@ -124,6 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ORDER BY warning_level ASC, create_time DESC LIMIT 1000000000 ) t
         GROUP BY
         t.enforcement_department_id,searchDate
+        order by searchDate desc,enforcement_number desc
     </select>
     <select id="selectLawEnforcementWarningListList2" parameterType="LawEnforcementWarningList" resultMap="LawEnforcementWarningListResult">
         <include refid="selectLawEnforcementWarningListVo"/>