From 9ccfd089b6cac9f8ba0cb7cadfee01857a715f0d Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期六, 12 十月 2024 10:34:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dao/XhProductModelDao.java |   22 ++++++++++++++++++----
 1 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dao/XhProductModelDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dao/XhProductModelDao.java
index 1338d4f..932c99a 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dao/XhProductModelDao.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dao/XhProductModelDao.java
@@ -3,7 +3,6 @@
 import com.zt.common.dao.BaseDao;
 import com.zt.life.modules.mainPart.basicInfo.model.ProductImg;
 import com.zt.life.modules.mainPart.basicInfo.model.XhProductModel;
-import com.zt.life.modules.sysPictureBase.model.SysPictureBase;
 import org.apache.ibatis.annotations.Mapper;
 
 
@@ -23,11 +22,26 @@
     List<XhProductModel> getList(Map<String, Object> params);
 
 
-    Integer getNo(Long pid);
+    Integer getNo(Long pid, String productType);
 
     List<XhProductModel> getProductList();
 
-    List<ProductImg> getProduct(Long productId);
+    List<ProductImg> getProduct(Long productId, Long parentId);
 
-    String getDefaultImg();
+    List<XhProductModel> getTaskProductList();
+    XhProductModel getById(Long id);
+
+    List<XhProductModel> getByShipId(Long shipId);
+
+    List<XhProductModel> getProductTree(Long shipId);
+
+    void deleteByShipId(Long shipId);
+
+    List<XhProductModel> getProductPath(Long shipId);
+
+    void deleteByPid(Long id);
+
+    Long[] getByPid(Long id);
+
+    void getProductByShip(Long shipId);
 }

--
Gitblit v1.9.1