From 8b11f020f8fd532c3fa1f6ce7dcab3d48b057d63 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 16 七月 2024 15:00:01 +0800
Subject: [PATCH] 修改

---
 modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml |   51 +++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
index b4287cb..5a8e76a 100644
--- a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
@@ -2,12 +2,15 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.zt.life.modules.mainPart.basicInfo.dao.XhProductModelDao">
+    <delete id="deleteByShipId">
+        delete from product_model where ship_id =${shipId} and product_type &gt; 2
+    </delete>
 
     <select id="getList" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel">
-        select a.*
-        from product_model a
+        select *
+        from product_model
         <where>
-            a.is_delete = 0
+            is_delete = 0
             <if test="pid!=null">
                 and pid =${pid}
             </if>
@@ -18,7 +21,8 @@
                 and ${whereSql}
             </if>
         </where>
-        ORDER BY sort
+        ORDER BY
+        product_type,sort
     </select>
     <select id="getNo" resultType="java.lang.Integer">
         SELECT COUNT(*)
@@ -31,6 +35,7 @@
             <if test="pid==null">
                 and pid is null
             </if>
+            and product_type =${productType}
         </where>
         Group by product_type
     </select>
@@ -38,13 +43,14 @@
         select a.name, a.id
         from product_model a
         where a.is_delete = 0
-          and a.product_type = 5
+          and a.product_type = 1
     </select>
     <select id="getProduct" resultType="com.zt.life.modules.mainPart.basicInfo.model.ProductImg">
         SELECT a.operat_img                as imgPath,
                a.`NAME`                    as imgName,
                'node'                      as nodeType,
                ''                          as nodeTypeExt,
+               s.svg_content               as svgContent,
                s.width                     as imgWidth,
                s.height                    as imgHeight,
                a.id                        as dataId,
@@ -65,13 +71,39 @@
           AND ((a.PID = ${productId})
             or (a.PID in (select pid from product_model where id = ${productId} and product_type = 10) and
                 a.product_type &lt;&gt; 10))
+          and a.id not in (
+            select node_id
+            from model_rbd_node
+            where product_id in (
+                select pid
+                from product_model
+                where id = ${productId}
+                  and is_delete = 0
+                union
+                select id
+                from product_model
+                where is_delete = 0
+                  and pid = ${parentId}
+                  and id &lt;&gt; ${productId}
+            )
+            union
+            select node_id
+            from model_rbd_node
+            where product_id in (
+                select id
+                from product_model
+                where is_delete = 0 and pid = ${productId}
+            )
+        )
+
+
 
     </select>
     <select id="getTaskProductList" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel">
         select a.name, a.id
         from product_model a
         where a.is_delete = 0
-          and a.product_type = 4
+          and a.product_type = 2
     </select>
     <select id="getById" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel">
         select a.*
@@ -79,5 +111,12 @@
         where a.is_delete = 0
           and a.id = #{id}
     </select>
+    <select id="getByShipId" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel">
+        select a.*
+        from product_model a
+        where a.is_delete = 0
+          and a.ship_id = #{shipId}
+          and a.product_type &gt; 2
+    </select>
 
 </mapper>

--
Gitblit v1.9.1