From a6f59f0908e5787d55c098c17f4eec365cf6477a Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期六, 23 十一月 2024 11:41:25 +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 | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 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 458bffc..1bcb067 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
@@ -2,11 +2,9 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.example.erp.entity.sd.Order;
-import com.example.erp.entity.sd.Product;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
-import java.time.LocalDate;
import java.util.List;
import java.util.Map;
@@ -19,11 +17,35 @@
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);
- boolean reviewOrderById(String id,Integer status);
+ boolean reviewOrderById(String id, Integer status, String userId, String userName);
+
+ boolean reviewOrderByIds(String id, Integer status, String userId, String userName);
boolean reviewProcessById(String id, Integer status);
boolean updateMoney(@Param("order") Order order);
Integer cancelOrder(String id);
+
+ List<Order> selectOrder(@Param("order") Order order);
+
+ 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);
}
--
Gitblit v1.8.0