From 182c04e399f5db26406234767f7ef34b5adc0015 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 20 八月 2025 18:19:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/andon/mapper/AndonButtonConfigMapper.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/andon/mapper/AndonButtonConfigMapper.java b/src/main/java/org/jeecg/modules/andon/mapper/AndonButtonConfigMapper.java
index 47fab66..26f8842 100644
--- a/src/main/java/org/jeecg/modules/andon/mapper/AndonButtonConfigMapper.java
+++ b/src/main/java/org/jeecg/modules/andon/mapper/AndonButtonConfigMapper.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
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;
@@ -27,14 +28,21 @@
* @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<AndonOrdeDto> queryUserAndonHandelList(String factoryId, String orderStatus);
}
--
Gitblit v1.9.3