From 371b3c34e5f1b5254cad83a38f2db3e3e75325fa Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Thu, 25 Jul 2024 17:49:23 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=8D=A0=E6=A1=A9=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/pile/OrderBasicInfoMapper.xml |  4 ++--
 jsowell-ui/src/views/pile/occupy/index.vue         | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
index 2a7e499fa..b4ce9442c 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
@@ -2950,7 +2950,7 @@
     where t1.del_flag = '0'
       and `t1`.`member_id` = #{memberId,jdbcType=VARCHAR}
       and `t1`.`station_id` = #{stationId,jdbcType=VARCHAR}
-      and `t1`.`charge_start_time` <![CDATA[ >= ]]> #{endTime,jdbcType=VARCHAR}
-      and `t1`.`charge_end_time` <![CDATA[ <= ]]> #{startTime,jdbcType=VARCHAR}
+      and `t1`.`charge_start_time` <![CDATA[ <= ]]> #{endTime,jdbcType=VARCHAR}
+      and `t1`.`charge_end_time` <![CDATA[ >= ]]> #{startTime,jdbcType=VARCHAR}
   </select>
 </mapper>
\ No newline at end of file
diff --git a/jsowell-ui/src/views/pile/occupy/index.vue b/jsowell-ui/src/views/pile/occupy/index.vue
index 9b16a5aa9..c5b2f3f51 100644
--- a/jsowell-ui/src/views/pile/occupy/index.vue
+++ b/jsowell-ui/src/views/pile/occupy/index.vue
@@ -22,14 +22,14 @@
           placeholder="请选择占桩开始时间">
         </el-date-picker>
       </el-form-item>
-      <!--      <el-form-item label="占桩结束时间" prop="endTime">-->
-      <!--        <el-date-picker class="stake-up" clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd"-->
-      <!--          placeholder="请选择占桩结束时间">-->
-      <!--        </el-date-picker>-->
-      <!--      </el-form-item>-->
-      <el-form-item label="占桩订单金额" prop="orderAmount">
+            <el-form-item label="占桩结束时间" prop="endTime">
+              <el-date-picker class="stake-up" clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd"
+                placeholder="请选择占桩结束时间">
+              </el-date-picker>
+            </el-form-item>
+<!--      <el-form-item label="占桩订单金额" prop="orderAmount">
         <el-input v-model="queryParams.orderAmount" placeholder="请输入占桩订单金额" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="充电桩编号" prop="pileSn">
         <el-input v-model="queryParams.pileSn" placeholder="请输入充电桩编号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>