From b0ae9e5d1c8add200ded8957c068223b9703c1e3 Mon Sep 17 00:00:00 2001 From: lixiangyu <lixiangyu@xalxzn.com> Date: 星期三, 27 八月 2025 18:00:09 +0800 Subject: [PATCH] feat(cms): 为 RatedLife 实体添加字典注解- 在 RatedLife 实体的 cuttingId 字段上添加了 @Dict 注解 - 优化了 RatedLifeController 中的代码格式和注释 --- src/main/java/org/jeecg/modules/andon/service/IAndonButtonConfigService.java | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 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 dca5f8f..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,13 +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<AndonOrdeDto> queryUserAndonHandelList(String factoryId,String orderStatus); } -- Gitblit v1.9.3