订单时间修改

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/controller/PayOrderController.java

@@ -22,7 +22,7 @@ import com.yijia.common.core.page.TableDataInfo;
 
 /**
  * 订单支付Controller
- * 
+ *
  * @author yijia
  * @date 2020-12-10
  */

Yijia-SaaS/yijia-station/src/main/resources/mapper/station/PayOrderMapper.xml

@@ -41,9 +41,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="orderLiters != null  and orderLiters != ''"> and order_liters = #{orderLiters}</if>
             <if test="payType != null  and payType != ''"> and pay_type = #{payType}</if>
             <if test="payWay != null  and payWay != ''"> and pay_way = #{payWay}</if>
-            <if test="payDate != null "> and pay_date = #{payDate}</if>
-            <if test="oilPersonnel != null  and oilPersonnel != ''"> and oil_personnel = #{oilPersonnel}</if>
-            <if test="createdDate != null "> and created_date = #{createdDate}</if>
+            <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
+                AND date_format(created_date,'%y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%y-%m-%d %H:%i:%s')
+            </if>
+            <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
+                AND date_format(created_date,'%y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%y-%m-%d %H:%i:%s')
+            </if>
+<!--            <if test="payDate != null "> and pay_date = #{payDate}</if>-->
+<!--            <if test="oilPersonnel != null  and oilPersonnel != ''"> and oil_personnel = #{oilPersonnel}</if>-->
+<!--            <if test="createdDate != null "> and created_date = #{createdDate}</if>-->
             <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
         </where>
         ORDER BY created_date DESC

Yijia-SaaS/yijia-ui/src/views/station/order/index.vue

@@ -103,14 +103,6 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="支付时间" prop="payDate">
-        <el-date-picker clearable size="small" style="width: 200px"
-                        v-model="queryParams.payDate"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="选择支付时间">
-        </el-date-picker>
-      </el-form-item>
       <el-form-item label="加油员" prop="oilPersonnel">
         <el-input
           v-model="queryParams.oilPersonnel"
@@ -120,19 +112,21 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="创建时间" prop="createdDate">
-        <el-date-picker clearable size="small" style="width: 200px"
-                        v-model="queryParams.createdDate"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="选择创建时间">
-        </el-date-picker>
-      </el-form-item>
       <el-form-item label="订单类型" prop="orderType">
         <el-select v-model="queryParams.orderType" placeholder="请选择订单类型" clearable size="small">
           <el-option label="请选择字典生成" value="" />
         </el-select>
       </el-form-item>
+
+      <el-form-item label="创建时间" prop="createdDate">
+        <el-date-picker style="width: 350px"
+          v-model="dateRangeCreatedDate" size="mini" value-format="yyyy-MM-dd HH:mm:ss"
+          type="datetimerange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期">
+        </el-date-picker>
+      </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -338,6 +332,9 @@
     name: "Order",
     data() {
       return {
+
+        //创建订单时间间隔
+        dateRangeCreatedDate:[],
         // 遮罩层
         loading: true,
         // 选中数组
@@ -375,7 +372,13 @@
           orderLiters: null,
           payType: null,
           payWay: null,
+          // pay:[],
+          // cre:[],
           payDate: null,
+          payMaxDate: null,
+          payMinDate: null,
+          createdMaxDate: null,
+          createdMinDate: null,
           oilPersonnel: null,
           createdDate: null,
           orderType: null
@@ -433,7 +436,7 @@
       /** 查询订单支付列表 */
       getList() {
         this.loading = true;
-        listOrder(this.queryParams).then(response => {
+        listOrder(this.addDateRange(this.queryParams, this.dateRangeCreatedDate)).then(response => {
           this.orderList = response.rows;
           this.total = response.total;
           this.loading = false;
@@ -473,6 +476,7 @@
       },
       /** 重置按钮操作 */
       resetQuery() {
+        this.dateRangeCreatedDate =[];
         this.resetForm("queryForm");
         this.handleQuery();
       },