From f0af76febdef24909246fff961ac08af141bebb9 Mon Sep 17 00:00:00 2001
From: shil <452061493@qq.com>
Date: Tue, 29 Jul 2025 14:47:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E7=94=A8=E5=88=B0=E7=9A=84?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E6=94=B9=E6=88=90=E6=89=A7?=
 =?UTF-8?q?=E6=B3=95=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EnforcementInspectionProgramMapper.xml    | 34 +++++++++----------
 .../mapper/EnforcementRegistrationMapper.xml  |  2 +-
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml
index 361a99da..ebfffedd 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml
@@ -187,19 +187,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     and bureau_dept_name like concat('%', #{bureauDeptName}, '%')
                 </if>
                 <if test="beginTime != null and beginTime != ''">
-                    and DATE_FORMAT(create_time,'%Y-%m-%d') >= #{beginTime}
+                    and DATE_FORMAT(enforcement_time,'%Y-%m-%d') >= #{beginTime}
                 </if>
                 <if test="endTime != null and endTime != ''">
-                    and #{endTime} >= DATE_FORMAT(create_time,'%Y-%m-%d')
+                    and #{endTime} >= DATE_FORMAT(enforcement_time,'%Y-%m-%d')
                 </if>
                 <if test="year != null and year != ''">
-                    and YEAR(create_time) = #{year}
+                    and YEAR(enforcement_time) = #{year}
                 </if>
                 <if test="quarter != null and quarter != '' ">
-                    and QUARTER(create_time) = #{quarter}
+                    and QUARTER(enforcement_time) = #{quarter}
                 </if>
                 <if test="month != null and month != '' ">
-                    and DATE_FORMAT(create_time, '%m') = #{month}
+                    and DATE_FORMAT(enforcement_time, '%m') = #{month}
                 </if>
                 <if test="params.dataScope != null and params.dataScope != ''">
                     ${params.dataScope}
@@ -223,19 +223,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 bureau_dept_name like concat('%', #{bureauDeptName}, '%')
             </if>
             <if test="beginTime != null and beginTime != ''">
-                and DATE_FORMAT(create_time,'%Y-%m-%d') >= #{beginTime}
+                and DATE_FORMAT(enforcement_time,'%Y-%m-%d') >= #{beginTime}
             </if>
             <if test="endTime != null and endTime != ''">
-                and #{endTime} >= DATE_FORMAT(create_time,'%Y-%m-%d')
+                and #{endTime} >= DATE_FORMAT(enforcement_time,'%Y-%m-%d')
             </if>
             <if test="year != null and year != ''">
-                and YEAR(create_time) = #{year}
+                and YEAR(enforcement_time) = #{year}
             </if>
             <if test="quarter != null and quarter != '' ">
-                and QUARTER(create_time) = #{quarter}
+                and QUARTER(enforcement_time) = #{quarter}
             </if>
             <if test="month != null and month != '' ">
-                and DATE_FORMAT(create_time, '%m') = #{month}
+                and DATE_FORMAT(enforcement_time, '%m') = #{month}
             </if>
             <if test="params.dataScope != null and params.dataScope != ''">
                 ${params.dataScope}
@@ -291,19 +291,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and bureau_dept_name like concat('%', #{bureauDeptName}, '%')
             </if>
             <if test="beginTime != null and beginTime != ''">
-                and <![CDATA[  create_time >= concat('%', #{beginTime}, '%') ]]>
+                and <![CDATA[  create_time >= concat('%', #{enforcement_time}, '%') ]]>
             </if>
             <if test="endTime != null and endTime != ''">
-                and <![CDATA[  create_time <= concat('%', #{endTime}, '%') ]]>
+                and <![CDATA[  create_time <= concat('%', #{enforcement_time}, '%') ]]>
             </if>
             <if test="year != null and year != ''">
-                and YEAR(create_time) = #{year}
+                and YEAR(enforcement_time) = #{year}
             </if>
             <if test="quarter != null and quarter != '' ">
-                and QUARTER(create_time) = #{quarter}
+                and QUARTER(enforcement_time) = #{quarter}
             </if>
             <if test="month != null and month != '' ">
-                and DATE_FORMAT(create_time, '%m') = #{month}
+                and DATE_FORMAT(enforcement_time, '%m') = #{month}
             </if>
             <if test="params.dataScope != null and params.dataScope != ''">
                 ${params.dataScope}
@@ -359,7 +359,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM enforcement_inspection_program
         <where>
             <if test="year != null and year != ''">
-                AND YEAR(create_time) = #{year}
+                AND YEAR(enforcement_time) = #{year}
             </if>
             <if test="params.dataScope != null and params.dataScope != ''">
                 ${params.dataScope}
@@ -424,7 +424,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM enforcement_inspection_program
         <where>
             <if test="year != null and year != ''">
-                AND YEAR(create_time) = #{year}
+                AND YEAR(enforcement_time) = #{year}
             </if>
             <if test="params.dataScope != null and params.dataScope != ''">
                 ${params.dataScope}
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
index 8534ab4b..b3affa3a 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
@@ -505,7 +505,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 ${params.dataScope}
             </if>
         </where>
-            order by create_time desc
+            order by enforcement_time desc
     </select>
 
     <select id="selectEnforcementRegistrationAndAddressList" parameterType="EnforcementRegistration" resultMap="EnforcementRegistrationResult">