From 9daeb6eac6e46710055e625bbbd56331b8890e21 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期三, 04 十一月 2026 10:10:20 +0800
Subject: [PATCH] revert(energy): 撤销 energy 模块移植(与新高原有 em 模块重复)

---
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/item/MesMdItemMapper.java |   23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/item/MesMdItemMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/item/MesMdItemMapper.java
index 81d024d..764c5b6 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/item/MesMdItemMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/item/MesMdItemMapper.java
@@ -7,6 +7,8 @@
 import cn.iocoder.yudao.module.mes.controller.admin.md.item.vo.MesMdItemPageReqVO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -19,27 +21,25 @@
 /**
  * MES 鐗╂枡浜у搧 Mapper
  *
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠$悊鍛�
  */
 @Mapper
 public interface MesMdItemMapper extends BaseMapperX<MesMdItemDO> {
 
     default PageResult<MesMdItemDO> selectPage(MesMdItemPageReqVO reqVO, Collection<Long> itemTypeIds) {
         return selectPage(reqVO, new LambdaQueryWrapperX<MesMdItemDO>()
+                .inIfPresent(MesMdItemDO::getId, reqVO.getIds())
                 .likeIfPresent(MesMdItemDO::getCode, reqVO.getCode())
                 .likeIfPresent(MesMdItemDO::getName, reqVO.getName())
                 .inIfPresent(MesMdItemDO::getItemTypeId, itemTypeIds)
                 .eqIfPresent(MesMdItemDO::getStatus, reqVO.getStatus())
                 .betweenIfPresent(MesMdItemDO::getCreateTime, reqVO.getCreateTime())
+                .orderByAsc(MesMdItemDO::getSort)
                 .orderByDesc(MesMdItemDO::getId));
     }
 
     default MesMdItemDO selectByCode(String code) {
         return selectOne(MesMdItemDO::getCode, code);
-    }
-
-    default MesMdItemDO selectByName(String name) {
-        return selectOne(MesMdItemDO::getName, name);
     }
 
     default Long selectCountByItemTypeId(Long itemTypeId) {
@@ -55,6 +55,19 @@
     }
 
     /**
+     * 鎸� ID 鏌ヨ璁板綍锛堜笉杩囨护閫昏緫鍒犻櫎锛屽惈宸插垹闄よ锛�
+     * 鐢ㄤ簬"鍙栨秷鍚屾锛堥�昏緫鍒犻櫎锛夊悗閲嶆柊鍚屾"鏃跺垽鏂富閿槸鍚﹁鍗犵敤
+     */
+    @Select("SELECT * FROM mes_md_item WHERE id = #{id} LIMIT 1")
+    MesMdItemDO selectAnyById(Long id);
+
+    /**
+     * 鎭㈠閫昏緫鍒犻櫎鐨勮褰曪紙deleted 缃� 0锛�
+     */
+    @Update("UPDATE mes_md_item SET deleted = 0, update_time = NOW() WHERE id = #{id}")
+    int restoreById(Long id);
+
+    /**
      * 鎵归噺鏌ヨ宸插瓨鍦ㄧ殑 MDM 鐗╂枡 ID 闆嗗悎
      *
      * @param mdmItemIds MDM 鐗╂枡 ID 鍒楄〃

--
Gitblit v1.9.3