From 19beea5d5dc165efb0feca7c4c0a296819010178 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期三, 04 十二月 2024 11:16:17 +0800
Subject: [PATCH] 修改bug：传给仿真算法包的modelId重复。（将工况ID改为阶段模型ID）

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

diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
index e1d3552..19a32ca 100644
--- a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
@@ -50,6 +50,12 @@
         select a.name, a.id
         from product_model a
         where a.is_delete = 0
+        <if test="type!=null and type!=''">
+            and a.product_type = ${type}
+        </if>
+        <if test="shipId!=null">
+            and a.ship_id = ${shipId}
+        </if>
     </select>
     <select id="getProduct" resultType="com.zt.life.modules.mainPart.basicInfo.model.ProductImg">
         SELECT a.operat_img                 as imgPath,
@@ -185,13 +191,14 @@
           and a.ship_id = ${shipId}
           AND a.id &lt;&gt; a.ship_id
           and a.id = b.product_id
+          and a.product_type = 5
     </select>
     <select id="getProductListByShip" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel">
         select a.*, b.basic_unit_num as sameSbNum
         from product_model a,
-             param_data b
+        param_data b
         where a.IS_DELETE = 0 and b.IS_DELETE = 0
-          and a.id = b.product_id
+        and a.id = b.product_id
         <if test="productId !=null">
             and a.ship_id = #{productId}
         </if>
@@ -202,4 +209,9 @@
             and a.product_type &lt;= #{level2}
         </if>
     </select>
+    <select id="getProductListAll" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel">
+        select id, operat_img
+        from product_model
+        where IS_DELETE = 0
+    </select>
 </mapper>

--
Gitblit v1.9.1