From c688ad2d55d6a5355e0e75402177f3e7989600bc Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期三, 08 一月 2025 16:10:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion
---
src/main/java/com/zy/asrs/mapper/OrderMapper.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/OrderMapper.java b/src/main/java/com/zy/asrs/mapper/OrderMapper.java
index 7075216..0c09a6c 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderMapper.java
@@ -8,6 +8,7 @@
import org.springframework.stereotype.Repository;
import java.util.List;
+import java.util.Map;
@Mapper
@Repository
@@ -16,7 +17,15 @@
int updateSettle(@Param("orderId")Long orderId, @Param("settle")Long settle, @Param("userId")Long userId);
List<Order> selectComplete();
+ List<Order> selectCompleteSave();
+ List<Order> selectComplete1();
+ List<Order> selectComplete2();
+ List<Order> selectCompleteMome0();
+ List<Order> selectCompleteMome1();
+ List<Order> selectCompleteMome2();
+ List<Order> selectCompleteMome3();
+ List<Order> selectCompleteMome4();
int addToLogTable(Order order);
Integer checkDetlWorkQtyLess0(@Param("orderNo") String orderNo);
@@ -28,4 +37,8 @@
List<Order> selectToBeHistoryOrder(@Param("settle")int settle);
List<OrderListDTO> selectAllorderNo();
+
+ List<Order> getOrderAll(Map<String, Object> condition);
+
+ long getOrderAllCount(Map<String, Object> condition);
}
--
Gitblit v1.9.1