From 9ccfd089b6cac9f8ba0cb7cadfee01857a715f0d Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期六, 12 十月 2024 10:34:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/resources/mapper/basicInfo/ParamDataDao.xml | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/ParamDataDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/ParamDataDao.xml
index 7c7b542..50869cc 100644
--- a/modules/mainPart/src/main/resources/mapper/basicInfo/ParamDataDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/ParamDataDao.xml
@@ -3,6 +3,12 @@
<mapper namespace="com.zt.life.modules.mainPart.basicInfo.dao.ParamDataDao">
+ <delete id="deleteByShipId">
+ delete
+ from param_data
+ where ship_id = ${shipId}
+ </delete>
+
<select id="getList" resultType="com.zt.life.modules.mainPart.basicInfo.model.ParamData">
SELECT
a.NAME,
@@ -13,9 +19,10 @@
END AS productIdInit
FROM
product_model a
- LEFT JOIN param_data b ON b.product_id = a.id and b.page_code = '${pageCode}'
+ 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 <> 10
<if test="srcId!=null">
and a.pid =${srcId}
</if>
@@ -26,9 +33,32 @@
and ${whereSql}
</if>
</where>
- <if test="orderBySql!=null">
- ORDER BY ${orderBySql}
- </if>
+ ORDER BY
+ a.product_type,a.sort
+ </select>
+ <select id="getParamData" resultType="com.zt.life.modules.mainPart.basicInfo.model.ParamData">
+ SELECT a.*
+ FROM param_data a
+ WHERE a.is_delete = 0
+ and a.product_id = #{productId}
+ limit 1
+ </select>
+ <select id="getByShipId" resultType="com.zt.life.modules.mainPart.basicInfo.model.ParamData">
+ SELECT a.*
+ FROM param_data a
+ where a.is_delete = 0
+ 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