From fe891f627a483eb6298f12eca60cf7f274e31c88 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期三, 20 八月 2025 16:54:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/andon/service/impl/AndonButtonConfigServiceImpl.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/andon/service/impl/AndonButtonConfigServiceImpl.java b/src/main/java/org/jeecg/modules/andon/service/impl/AndonButtonConfigServiceImpl.java
index e6b670a..c1eea0f 100644
--- a/src/main/java/org/jeecg/modules/andon/service/impl/AndonButtonConfigServiceImpl.java
+++ b/src/main/java/org/jeecg/modules/andon/service/impl/AndonButtonConfigServiceImpl.java
@@ -1,7 +1,9 @@
package org.jeecg.modules.andon.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import liquibase.pro.packaged.S;
import org.jeecg.modules.andon.dto.AndonButtonDTO;
+import org.jeecg.modules.andon.dto.AndonOrdeDto;
import org.jeecg.modules.andon.entity.AndonButtonConfig;
import org.jeecg.modules.andon.mapper.AndonButtonConfigMapper;
import org.jeecg.modules.andon.service.IAndonButtonConfigService;
@@ -30,13 +32,18 @@
}
@Override
- public List<AndonButtonDTO> queryUserAndonCallList(String factoryId) {
- return baseMapper.queryUserAndonCallList(factoryId);
+ public List<AndonOrdeDto> queryUserAndonCallList(String factoryId, String orderStatus) {
+ return baseMapper.queryUserAndonCallList(factoryId, orderStatus);
}
@Override
- public List<AndonButtonDTO> queryUserAndonRespondList(String factoryId) {
- return baseMapper.queryUserAndonRespondList(factoryId);
+ public List<AndonOrdeDto> queryUserAndonRespondList(String factoryId, String orderStatus) {
+ return baseMapper.queryUserAndonRespondList(factoryId, orderStatus);
+ }
+
+ @Override
+ public List<AndonOrdeDto> queryUserAndonHandelList(String factoryId, String orderStatus) {
+ return baseMapper.queryUserAndonHandelList(factoryId, orderStatus);
}
--
Gitblit v1.9.3