From c0e3f24edd2ef47339c676ff3dc6fdc06b3c387e Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 18 十月 2024 10:42:40 +0800
Subject: [PATCH] 1）修改bug：可靠性预计参数配置，可靠性分布类型下拉框缺少威布尔分布； 2）细化可靠性仿真评估报错信息。

---
 modules/mainPart/src/main/resources/mapper/basicInfo/ParamDataDao.xml |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/ParamDataDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/ParamDataDao.xml
index 78c92b2..50869cc 100644
--- a/modules/mainPart/src/main/resources/mapper/basicInfo/ParamDataDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/ParamDataDao.xml
@@ -2,8 +2,11 @@
 <!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.ParamDataDao">
+
     <delete id="deleteByShipId">
-        delete from param_data where ship_id =${shipId}
+        delete
+        from param_data
+        where ship_id = ${shipId}
     </delete>
 
     <select id="getList" resultType="com.zt.life.modules.mainPart.basicInfo.model.ParamData">
@@ -16,7 +19,7 @@
         END AS productIdInit
         FROM
         product_model a
-        LEFT JOIN param_data b ON b.product_id = a.id and b.page_code = '${pageCode}' and b.is_delete = 0
+        LEFT JOIN param_data b ON b.product_id = a.id  and b.is_delete = 0
         <where>
             a.is_delete = 0
             and a.product_type &lt;&gt; 10
@@ -38,7 +41,6 @@
         FROM param_data a
         WHERE a.is_delete = 0
           and a.product_id = #{productId}
-          and a.page_code = #{pageCode}
         limit 1
     </select>
     <select id="getByShipId" resultType="com.zt.life.modules.mainPart.basicInfo.model.ParamData">
@@ -48,4 +50,15 @@
           and a.ship_id = #{shipId}
     </select>
 
+    <select id="getDeviceParams" resultType="com.zt.life.modules.mainPart.basicInfo.model.ParamData">
+        SELECT a.*
+        FROM param_data a
+        inner join product_model b on b.id=a.product_id
+        where a.is_delete = 0
+          and b.is_delete = 0
+          and b.product_type = '5'
+        <if test="shipId!=null">
+            and a.ship_id = #{shipId}
+        </if>
+    </select>
 </mapper>

--
Gitblit v1.9.1