From 86adbb1544142dcfb48333dade822f81640607a6 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期五, 01 九月 2023 13:50:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/mom/mapper/MaterialMapper.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/mom/mapper/MaterialMapper.java b/standard-server/src/main/java/com/yuanchu/mom/mapper/MaterialMapper.java
index 7d429c1..47d4ae2 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/mapper/MaterialMapper.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/mapper/MaterialMapper.java
@@ -2,8 +2,6 @@
import com.yuanchu.mom.pojo.Material;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yuanchu.mom.pojo.dto.MaterialTreeDto;
-import org.apache.ibatis.annotations.MapKey;
import java.util.List;
import java.util.Map;
@@ -17,14 +15,18 @@
public interface MaterialMapper extends BaseMapper<Material> {
- @MapKey("id")
- List<MaterialTreeDto> selectTreeByMaterial();
+
+ //鏍囧噯MOM-->宸︿晶浜旂骇鏍戝睍绀�
+ List<Map<String,Object>> selectTreeByMaterial();
//鏍规嵁鐗╂枡鍚嶇О鏌ヨ鐗╂枡id鍜岀墿鏂欑紪鐮�
List<Material> selectMcodeId(String name);
//鏍规嵁鐗╂枡鍚嶇О鍜岀墿鏂欑紪鐮佹煡璇㈢墿鏂檌d,瑙勬牸淇℃伅鍜屽瀷鍙蜂俊鎭�
List<Map> selectIdByCoNa(String name, String code);
+
+ //鏍规嵁鏍囧噯id鏌ヨ鐗╂枡
+ Material selFath(Integer id);
}
--
Gitblit v1.9.3