From 4529041089b80a473a6bd4025a2c9770458f203a Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期二, 25 六月 2024 17:36:00 +0800
Subject: [PATCH] Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang

---
 javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/HoleLogMapper.xml |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/HoleLogMapper.xml b/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/HoleLogMapper.xml
index 5dd1238..bbd9be5 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/HoleLogMapper.xml
+++ b/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/HoleLogMapper.xml
@@ -32,14 +32,15 @@
             <if test="recordPerson != null  and recordPerson != ''"> and record_person = #{recordPerson}</if>
             <if test="description != null  and description != ''"> and description = #{description}</if>
             <!-- 寮�濮嬫椂闂存绱� -->
-            <if test="params.beginTime != null and params.beginTime != ''">
+            <if test="params.beginCreateTime != null and params.beginCreateTime != ''">
                 and date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginCreateTime},'%y%m%d')
             </if>
             <!-- 缁撴潫鏃堕棿妫�绱� -->
-            <if test="params.endTime != null and params.endTime != ''">
+            <if test="params.endCreateTime != null and params.endCreateTime != ''">
                 and date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endCreateTime},'%y%m%d')
             </if>
         </where>
+        order by create_time asc
     </select>
     
     <select id="selectHoleLogById" parameterType="String" resultMap="HoleLogResult">

--
Gitblit v1.9.1