From a7748c3f762c5a68c368effdfef9c6f8e867059b Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 10 二月 2025 09:27:03 +0800
Subject: [PATCH] 更改查询历史项目分组条件

---
 north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
index eba39bb..1a9ad90 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
@@ -165,7 +165,7 @@
 
     private String getOrderId(String dateType){
         String orderId = null;
-        if(dateType.equals("day")){
+        if(dateType==null || dateType.equals("day")){
             Integer maxOrderId = orderMapper.selectMaxOrderId();
             //鏌ヨ璁㈠崟id锛屽苟涓旇嚜澧�
             String formattedNumber = String.format("%02d", maxOrderId+1);
@@ -797,4 +797,8 @@
         }
         return saveState;
     }
+
+    public Boolean selectDifferentSize(String orderId) {
+        return !orderMapper.selectDifferentSize(orderId).isEmpty();
+    }
 }

--
Gitblit v1.8.0