From 28c2126249a35ded0b816a07d80c015caa45a4f3 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 11 二月 2025 09:40:27 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderMapper.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderMapper.java
index b7990bd..fdd48f9 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderMapper.java
@@ -14,8 +14,8 @@
boolean updateOrderParameter(@Param("orderId") String orderId);
- List<Order> getOrderList(Integer offset, Integer pageSize, String startDate, String endDate, Order order, Integer orderType);
- Map<String,Integer> getPageTotal(Integer offset, Integer pageSize, String startDate, String endDate, Order order , Integer orderType);
+ List<Order> getOrderList(Integer offset, Integer pageSize, String startDate, String endDate, Order order, Integer orderType, String field, String orderBy);
+ Map<String,Float> getPageTotal(Integer offset, Integer pageSize, String startDate, String endDate, Order order , Integer orderType);
boolean reviewOrderById(String id, Integer status, String userId, String userName);
@@ -32,4 +32,22 @@
Integer selectMaxOrderIdByMonth();
boolean updateOrderPrintNumber(@Param("orderId") String orderId);
+
+ Integer selectMaxOrderIdByYear();
+
+ Integer selectOrderIdMin(Integer substringInt);
+
+ Integer selectOrderIdIs(Integer substringInt);
+
+ Integer selectOrderIdDay(String oldOrderId);
+
+ Integer selectOrderIdMonth(String oldOrderId);
+
+ Integer selectOrderIdYear(String oldOrderId);
+
+ Boolean updateOrderId(String oldOrderId,String newOrderId);
+
+ Order selectOrderId(String orderId);
+
+ List<Map<String,String>> selectDifferentSize(String orderId);
}
--
Gitblit v1.8.0