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/java/com/webmanage/mapper/OrderInfoMapper.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/webmanage/mapper/OrderInfoMapper.java b/src/main/java/com/webmanage/mapper/OrderInfoMapper.java
index 055b06f..89a80cd 100644
--- a/src/main/java/com/webmanage/mapper/OrderInfoMapper.java
+++ b/src/main/java/com/webmanage/mapper/OrderInfoMapper.java
@@ -42,7 +42,17 @@
@Param("productName") String productName, @Param("providerName") String providerName,
@Param("orderId") String orderId, @Param("applyTimeStart") String applyTimeStart,
@Param("applyTimeEnd") String applyTimeEnd, @Param("orderBy") String orderBy,
- @Param("orderDirection") String orderDirection);
+ @Param("orderDirection") String orderDirection, @Param("workFlowIds") java.util.List<String> workFlowIds);
+
+ /**
+ * 鍒嗛〉鏌ヨ寰呭鎵硅鍗曞垪琛紙鏀寔浜у搧鏉′欢锛�
+ */
+ IPage<OrderInfo> selectPendingApprovalOrderPageWithProductConditions(Page<OrderInfo> page, @Param("orderStatus") String orderStatus,
+ @Param("productName") String productName, @Param("providerName") String providerName,
+ @Param("orderId") String orderId, @Param("applyTimeStart") String applyTimeStart,
+ @Param("applyTimeEnd") String applyTimeEnd, @Param("orderBy") String orderBy,
+ @Param("orderDirection") String orderDirection, @Param("productIds") java.util.List<String> productIds,
+ @Param("workFlowIds") java.util.List<String> workFlowIds);
/**
* 鍒嗛〉鏌ヨ涔板璁㈠崟鍒楄〃锛堟敮鎸佷骇鍝佹潯浠讹級
--
Gitblit v1.8.0