From bdec8b24b78a6f52d21fff2cc8dfab847304dacc Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期四, 03 四月 2025 11:46:50 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamMaintenanceStandardService.java | 28 +++++++++++++++++++++++++++- 1 files changed, 27 insertions(+), 1 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamMaintenanceStandardService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamMaintenanceStandardService.java index 1f9831a..8890114 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamMaintenanceStandardService.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamMaintenanceStandardService.java @@ -1,8 +1,12 @@ package org.jeecg.modules.eam.service; -import org.jeecg.modules.eam.entity.EamMaintenanceStandard; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.eam.entity.EamMaintenanceStandard; import org.jeecg.modules.eam.request.EamMaintenanceStandardRequest; + +import java.util.List; /** * @Description: 淇濆吇鏍囧噯 @@ -11,6 +15,13 @@ * @Version: V1.0 */ public interface IEamMaintenanceStandardService extends IService<EamMaintenanceStandard> { + /** + * 鍒嗛〉鏌ヨ + * @param page + * @param eamMaintenanceStandard + * @return + */ + IPage<EamMaintenanceStandard> queryPageList(Page<EamMaintenanceStandard> page, EamMaintenanceStandard eamMaintenanceStandard); /** * 鏂板 淇濆吇鏍囧噯 @@ -25,10 +36,25 @@ boolean editMaintenanceStandard(EamMaintenanceStandardRequest standardRequest); /** + * 鍗囩増 + * @param standardRequest + * @return + */ + boolean upgradeMaintenanceStandard(EamMaintenanceStandardRequest standardRequest); + + /** * 閲嶅鎬ф牎楠� * @param equipmentId 璁惧缂栧彿 * @param maintenanceCategory 淇濆吇绫诲瀷 * @return */ EamMaintenanceStandard checkDuplicate(String equipmentId, String maintenanceCategory); + + /** + * 鏌ヨ鏍囧噯鍒楄〃-鍓嶇灞曠ず璇ョ敤鎴锋嫢鏈夌殑鏍囧噯 + * @param keyword 璁惧缂栧彿 + * @param maintenanceCategory 淇濆吇绫诲瀷 + * @return + */ + List<EamMaintenanceStandard> queryListBykeywordAndCategory( String keyword, String maintenanceCategory); } -- Gitblit v1.9.3