From 7c2c6a5e5b3d9f96aef3c67573aa62bbd9a3aa7f Mon Sep 17 00:00:00 2001
From: p-honggang.li <p-honggang.li@pcitc.com>
Date: 星期四, 11 九月 2025 10:48:18 +0800
Subject: [PATCH] 修改产品类型，单位工程条偶见查询问题

---
 src/main/resources/mapper/OrderInfoMapper.xml |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/OrderInfoMapper.xml b/src/main/resources/mapper/OrderInfoMapper.xml
index c527c0e..c4ad121 100644
--- a/src/main/resources/mapper/OrderInfoMapper.xml
+++ b/src/main/resources/mapper/OrderInfoMapper.xml
@@ -153,7 +153,7 @@
         <include refid="Base_Column_List"/>
         FROM tb_order_info
         WHERE deleted = 0
-        AND order_status IN ('寰呬笂浼犳枃浠�', '寰呮巿鏉�', '寰呬氦鏄撶‘璁�', '宸插畬鎴�', '宸茶瘎浠�')
+        AND order_status IN ('寰呭鎵规巿鏉�','寰呮巿鏉�', '寰呬氦鏄撶‘璁�', '宸插畬鎴�')
         <if test="orderStatus != null and orderStatus != ''">
             AND order_status = #{orderStatus}
         </if>
@@ -171,6 +171,12 @@
         </if>
         <if test="applyTimeEnd != null and applyTimeEnd != ''">
             AND apply_time &lt;= #{applyTimeEnd}::timestamp
+        </if>
+        <if test="workFlowIds != null and workFlowIds.size() > 0">
+            AND workflow_id IN
+            <foreach collection="workFlowIds" item="workFlowId" open="(" separator="," close=")">
+                #{workFlowId}
+            </foreach>
         </if>
         ORDER BY
         <choose>
@@ -197,7 +203,7 @@
         <include refid="Base_Column_List"/>
         FROM tb_order_info
         WHERE deleted = 0
-        AND order_status IN ('寰呬笂浼犳枃浠�', '寰呮巿鏉�', '寰呬氦鏄撶‘璁�', '宸插畬鎴�', '宸茶瘎浠�')
+        AND order_status IN ('寰呮巿鏉�', '寰呭鎵规巿鏉�', '寰呬氦鏄撶‘璁�', '宸插畬鎴�')
         <if test="orderStatus != null and orderStatus != ''">
             AND order_status = #{orderStatus}
         </if>
@@ -222,6 +228,12 @@
                 #{productId}
             </foreach>
         </if>
+        <if test="workFlowIds != null and workFlowIds.size() > 0">
+            AND workflow_id IN
+            <foreach collection="workFlowIds" item="workFlowId" open="(" separator="," close=")">
+                #{workFlowId}
+            </foreach>
+        </if>
         ORDER BY
         <choose>
             <when test="orderBy != null and orderBy != ''">

--
Gitblit v1.8.0