From 43f0e69715099cfc8c8b8ea5284b874bfad14400 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 19 八月 2025 10:49:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/andon/service/IAndonButtonConfigService.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/andon/service/IAndonButtonConfigService.java b/src/main/java/org/jeecg/modules/andon/service/IAndonButtonConfigService.java
index 500343c..1ff6772 100644
--- a/src/main/java/org/jeecg/modules/andon/service/IAndonButtonConfigService.java
+++ b/src/main/java/org/jeecg/modules/andon/service/IAndonButtonConfigService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.andon.dto.AndonButtonDTO;
+import org.jeecg.modules.andon.dto.AndonOrdeDto;
import org.jeecg.modules.andon.entity.AndonButtonConfig;
import java.util.List;
@@ -28,21 +29,20 @@
* @param factoryId
* @return
*/
- List<AndonButtonDTO> queryUserAndonCallList(String factoryId);
+ List<AndonOrdeDto> queryUserAndonCallList(String factoryId, String orderStatus);
/**
* 鏌ヨ鐢ㄦ埛鍙戣捣瀹夌伅鍝嶅簲鍒楄〃
* @param factoryId
* @return
*/
- List<AndonButtonDTO> queryUserAndonRespondList(String factoryId);
-
+ List<AndonOrdeDto> queryUserAndonRespondList(String factoryId,String orderStatus);
/**
* 鏌ヨ鐢ㄦ埛鍙戣捣瀹夌伅澶勭悊鍒楄〃
* @param factoryId
* @return
*/
- List<AndonButtonDTO> queryUserAndonHandelList(String factoryId);
+ List<AndonOrdeDto> queryUserAndonHandelList(String factoryId,String orderStatus);
}
--
Gitblit v1.9.3