From 48dcf2c7f01de5078f6a7f94dbc59400100e9ab6 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期三, 23 十月 2024 11:05:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dao/XhProductModelDao.java |   25 +++++++++++++++++++++++--
 1 files changed, 23 insertions(+), 2 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 b8c107f..25ab7c6 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,6 +1,8 @@
 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 org.apache.ibatis.annotations.Mapper;
 
@@ -10,7 +12,7 @@
 
 
 /**
- * xh_product_model
+ * product_model
  *
  * @author zt generator 
  * @since 1.0.0 2024-02-29
@@ -21,7 +23,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, 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);
 }

--
Gitblit v1.9.1