From 0091dd076ed7d6dfb06fa820dabd9cf5e738514c Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期四, 07 十一月 2024 17:15:13 +0800
Subject: [PATCH] 仿真评估检查模型时，总体工况模型里未使用的节点，不检查其模型是否存在。
---
modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml | 15 +++++++++++++--
1 files changed, 13 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..5e22afc 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,
@@ -189,9 +195,9 @@
<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 +208,9 @@
and a.product_type <= #{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