From 1cdccaf0a06161fcc2a5797e617508c8a7e1f300 Mon Sep 17 00:00:00 2001
From: p-honggang.li <p-honggang.li@pcitc.com>
Date: 星期六, 06 九月 2025 03:14:53 +0800
Subject: [PATCH] 修改订单创建，发起工作流调用，采用后端处理，增加事务，修改审核同通过和驳回处理，修改根据用户id获取工作流代办信息，再根据代办ids查询订单信息
---
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