From 362e0c05ae09acb0569a7225d40aa0b53e56dd1c Mon Sep 17 00:00:00 2001
From: zane <zane0312@foxmail.com>
Date: Thu, 5 Sep 2024 18:44:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/mapper/collect/IoCollectOrderMapper.xml          | 3 +++
 src/main/resources/schemas/schema_v2.4.sql                   | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml
index 37bc57986..d32301675 100644
--- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml
+++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml
@@ -92,6 +92,9 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="uploadStatus != null">
+                and ico.uploadStatus = #{uploadStatus}
+            </if>
         </where>
         order by case when ico.orderTime is null then ico.createTime else ico.orderTime end desc
     </select>
diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql
index 1c4d517cb..af256f8e1 100644
--- a/src/main/resources/schemas/schema_v2.4.sql
+++ b/src/main/resources/schemas/schema_v2.4.sql
@@ -4354,3 +4354,8 @@ CALL Pro_Temp_ColumnWork('thr_products', 'prepnSpec',
 CALL Pro_Temp_ColumnWork('thr_products', 'prepnUnit',
                          'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''制剂单位''',
                          1);
+
+
+CALL Pro_Temp_ColumnWork('io_collect_order', 'errorMsg',
+                         'varchar(1024) NULL COMMENT ''异常信息''',
+                         1);