预警统计排序，检查计划个数

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();

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>

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"/>