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/impl/AndonButtonConfigServiceImpl.java | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 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 92a7933..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,10 +1,16 @@ 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; import org.springframework.stereotype.Service; + +import java.util.Collections; +import java.util.List; /** * @Description: 瀹夌伅鎸夐挳閰嶇疆 @@ -19,4 +25,26 @@ public AndonButtonConfig getAndonButtonById(String id) { return baseMapper.getAndonButtonById(id); } + + @Override + public List<AndonButtonDTO> queryUserAndonButtonList(String factoryId) { + return baseMapper.queryUserAndonButtonList(factoryId); + } + + @Override + public List<AndonOrdeDto> queryUserAndonCallList(String factoryId, String orderStatus) { + return baseMapper.queryUserAndonCallList(factoryId, orderStatus); + } + + @Override + 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