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} + + and ico.uploadStatus = #{uploadStatus} + order by case when ico.orderTime is null then ico.createTime else ico.orderTime end desc 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);