From c1e06272e1c6397cc535d3aecb8748b5ba835514 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 09 四月 2025 08:06:14 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderMapper.java | 5 +++--
1 files changed, 3 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 668634d..41efa3e 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
@@ -1,6 +1,7 @@
package com.example.erp.mapper.sd;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.example.erp.dto.sd.OrderSearchDTO;
import com.example.erp.entity.sd.Order;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -14,8 +15,8 @@
boolean updateOrderParameter(@Param("orderId") String orderId);
- 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);
+ List<Order> getOrderList(Integer offset, Integer pageSize, String startDate, String endDate, OrderSearchDTO order, Integer orderType, String field, String orderBy);
+ Map<String,Float> getPageTotal(Integer offset, Integer pageSize, String startDate, String endDate, OrderSearchDTO order , Integer orderType);
boolean reviewOrderById(String id, Integer status, String userId, String userName);
--
Gitblit v1.8.0