From 6c86330fa96e532458ca2b47bd9c751f96fda216 Mon Sep 17 00:00:00 2001
From: likehai <likehai@inspur.com>
Date: Fri, 29 Dec 2023 15:27:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A9=E5=B1=B1=20=20=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/energy/EnergyGeneralInfoMapper.xml     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/God-Vue-master/god-system/src/main/resources/mapper/energy/EnergyGeneralInfoMapper.xml b/God-Vue-master/god-system/src/main/resources/mapper/energy/EnergyGeneralInfoMapper.xml
index f69884f8..cb814c93 100644
--- a/God-Vue-master/god-system/src/main/resources/mapper/energy/EnergyGeneralInfoMapper.xml
+++ b/God-Vue-master/god-system/src/main/resources/mapper/energy/EnergyGeneralInfoMapper.xml
@@ -90,6 +90,12 @@
             <if test="fieldSeventeen != null  and fieldSeventeen != ''">and field_seventeen = #{fieldSeventeen}</if>
             <if test="fieldEighteen != null  and fieldEighteen != ''">and field_eighteen = #{fieldEighteen}</if>
             <if test="fieldNineteen != null  and fieldNineteen != ''">and field_nineteen = #{fieldNineteen}</if>
+            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+                AND date_format(now_time_two,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+            </if>
+            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+                AND date_format(now_time_two,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+            </if>
         </where>
     </select>