From a6bee744b39fe44423624f0d268706c4257e4bba Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 16 七月 2025 08:57:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion
---
src/main/java/com/zy/asrs/mapper/OrderMapper.java | 15 +++++++++++++++
1 files changed, 15 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 af74849..0c09a6c 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderMapper.java
@@ -2,11 +2,13 @@
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.Order;
+import com.zy.asrs.entity.OrderListDTO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
+import java.util.Map;
@Mapper
@Repository
@@ -15,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);
@@ -26,4 +36,9 @@
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