From 17ce02ec6fefa4e8b9ac870e2b52dea0942f5597 Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期四, 05 十二月 2024 09:40:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dao/XhProductModelDao.java |   27 +++++++++++++++++++++++----
 1 files changed, 23 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 c1bf358..226ca83 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
@@ -1,9 +1,9 @@
 package com.zt.life.modules.mainPart.basicInfo.dao;
 
 import com.zt.common.dao.BaseDao;
+import com.zt.life.modules.mainPart.basicInfo.dto.ProductDto;
 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 +23,30 @@
     List<XhProductModel> getList(Map<String, Object> params);
 
 
-    Integer getNo(Long pid);
+    Integer getNo(Long pid, String productType);
 
-    List<XhProductModel> getProductList();
+    List<XhProductModel> getProductList(Long shipId, Integer type);
 
-    List<ProductImg> getProduct(Long productId);
+    List<ProductImg> getProduct(Long productId, Long parentId);
 
     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);
+
+    List<ProductDto> getProductByShip(Long shipId);
+
+    List<XhProductModel> getProductListByShip(Long productId, int level1, int level2);
+
+    List<XhProductModel> getProductListAll();
 }

--
Gitblit v1.9.1