From 774df846d6c295a4e255c321f9074c4c407395df Mon Sep 17 00:00:00 2001
From: zouyx <1798599149@qq.com>
Date: Sat, 14 Sep 2024 16:45:48 +0800
Subject: [PATCH] excel3

---
 .../mapper/EnforcementCheckStatisticsMapper.xml      | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementCheckStatisticsMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementCheckStatisticsMapper.xml
index e74b552b..79536c78 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementCheckStatisticsMapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementCheckStatisticsMapper.xml
@@ -22,7 +22,11 @@
         from enforcement_registration e
         inner join sys_dept s on e.law_enforcement_id=s.dept_id
         inner join enterprise_information i on e.enterprise_number=i.enterprise_number
-        where find_in_set(#{deptId},s.ancestors) and (year(e.create_time)=#{year}) and (month(e.create_time)in(${month}))
+        <where>
+            <if test="deptId != null  and deptId != ''">and find_in_set(#{deptId},s.ancestors)</if>
+            <if test="year != null  and year != ''">and (year(e.create_time)=#{year})</if>
+            <if test="month != null  and month != ''">and (month(e.create_time)in(${month}))</if>
+        </where>
         order by e.enterprise_name
     </select>
 
@@ -31,7 +35,11 @@
         from enforcement_registration e
         inner join sys_dept s on e.law_enforcement_id=s.dept_id
         inner join enterprise_information i on e.enterprise_number=i.enterprise_number
-        where !find_in_set((select dept_id from sys_dept where dept_name="区"),s.ancestors) and (year(e.create_time)=#{year}) and (month(e.create_time)in(${month}))
+        <where>
+            and !find_in_set((select dept_id from sys_dept where dept_name="区"),s.ancestors)
+            <if test="year != null  and year != ''">and (year(e.create_time)=#{year})</if>
+            <if test="month != null  and month != ''">and (month(e.create_time)in(${month}))</if>
+        </where>
         order by e.enterprise_name
     </select>