From 504379f3e377aa4aa9585c11d6991be91b1cd241 Mon Sep 17 00:00:00 2001
From: "UNISINSIGHT\\rdpnr_jiangpeng" <Cq258258>
Date: Tue, 7 Apr 2026 23:30:06 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E8=AE=A2=E5=8D=95=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 oms_web/oms_vue/src/views/project/order/index.vue |  6 +++---
 .../mapper/sip/ProjectOrderInfoMapper.xml         | 15 ++++++++++++++-
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/oms_web/oms_vue/src/views/project/order/index.vue b/oms_web/oms_vue/src/views/project/order/index.vue
index 8a7aca6e..71658bab 100644
--- a/oms_web/oms_vue/src/views/project/order/index.vue
+++ b/oms_web/oms_vue/src/views/project/order/index.vue
@@ -38,7 +38,7 @@
         <el-select v-model="queryParams.timeType" size="small" style="width: 140px">
           <el-option label="到货时间" value="deliveryTime"></el-option>
           <el-option label="下单时间" value="estimatedOrderTime"></el-option>
-          <el-option label="执行单截止时间" value="orderEndTime"></el-option>
+          <el-option label="订单生效时间" value="approveTime"></el-option>
         </el-select>
         <el-date-picker
           v-model="dateRange"
@@ -112,9 +112,9 @@
                 <span>{{ parseTime(scope.row.estimatedOrderTime, '{y}-{m}-{d}') }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="执行单截止时间" align="center" prop="orderEndTime" width="200" sortable="custom">
+            <el-table-column label="订单生效时间" align="center" prop="approveTime" width="200" sortable="custom">
               <template slot-scope="scope">
-                <span>{{ parseTime(scope.row.orderEndTime, '{y}-{m}-{d}') }}</span>
+                <span>{{ parseTime(scope.row.approveTime, '{y}-{m}-{d}') }}</span>
               </template>
             </el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="200">
diff --git a/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml
index 10087c57..c877b062 100644
--- a/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml
@@ -167,7 +167,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 <when test="params.endDeliveryTime != null">
                     and t1.delivery_time <![CDATA[ <= ]]> date_format(#{params.endDeliveryTime}, '%Y-%m-%d 23:59:59')
                 </when>
-
+            </choose>
+        </if>
+        <if test="params.beginApproveTime != null or params.endApproveTime != null">
+            <choose>
+                <when test="params.beginApproveTime != null and params.endApproveTime != null">
+                    and t1.approve_time between date_format(#{params.beginApproveTime}, '%Y-%m-%d 00:00:00') and
+                    date_format(#{params.endApproveTime}, '%Y-%m-%d 23:59:59')
+                </when>
+                <when test="params.beginApproveTime != null">
+                    and t1.approve_time <![CDATA[ >= ]]> date_format(#{params.beginApproveTime}, '%Y-%m-%d 00:00:00')
+                </when>
+                <when test="params.endApproveTime != null">
+                    and t1.approve_time <![CDATA[ <= ]]> date_format(#{params.endApproveTime}, '%Y-%m-%d 23:59:59')
+                </when>
             </choose>
         </if>
         <if test="updateTimeStart != null or updateTimeEnd != null">