From 7351c1260470e9348ed6d33047ce18370d906d54 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 08 十月 2024 17:12:09 +0800
Subject: [PATCH] 修改

---
 modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
index 1d33f52..d14dfec 100644
--- a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
@@ -6,7 +6,11 @@
         delete
         from product_model
         where ship_id = ${shipId}
-          and product_type &gt; 2
+    </delete>
+    <delete id="deleteByPid">
+        delete
+        from product_model
+        where PID = ${id}
     </delete>
 
     <select id="getList" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel">
@@ -46,7 +50,6 @@
         select a.name, a.id
         from product_model a
         where a.is_delete = 0
-          and a.product_type = 1
     </select>
     <select id="getProduct" resultType="com.zt.life.modules.mainPart.basicInfo.model.ProductImg">
         SELECT a.operat_img                 as imgPath,
@@ -54,6 +57,8 @@
                'node'                       as nodeType,
                ''                           as nodeTypeExt,
                s.svg_content                as svgContent,
+               s.anchors_content            as anchorsContent,
+               s.anchors_points             as anchorsPoints,
                s.width                      as imgWidth,
                s.height                     as imgHeight,
                a.id                         as dataId,
@@ -67,10 +72,11 @@
                p.repair_distrib_type        as repairDistribType,
                p.repair_mttcr               as repairMttcr,
                p.repair_mttcr_other_params2 as repairMttcrOtherParams2,
-               p.repair_mttcr_other_params3 as repairMttcrOtherParams3
+               p.repair_mttcr_other_params3 as repairMttcrOtherParams3,
+               p.task_mtbcf_regul_succ_rate as success_rate
         FROM product_model a
                  left join sys_dict_data d on d.DICT_VALUE = a.product_type and dict_type_id = '1728965873022050306'
-                 left join param_data p on p.product_id = a.id and p.page_code = 'expect'
+                 left join param_data p on p.product_id = a.id
                  left join sys_picture_base s on s.id = a.operat_img
         WHERE a.is_delete = 0
           AND ((a.PID = ${productId})
@@ -109,6 +115,7 @@
         from product_model a
         where a.is_delete = 0
           and a.product_type = 2
+        order by sort
     </select>
     <select id="getById" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel">
         select a.*
@@ -141,4 +148,9 @@
           and a.ship_id = ${shipId}
           and a.id = b.product_id
     </select>
+    <select id="getByPid" resultType="java.lang.Long">
+        select id
+        from product_model
+        where IS_DELETE=0 and PID=${id}
+    </select>
 </mapper>

--
Gitblit v1.9.1