From ea744c63bf10f14fe5a51addf37083c384093e21 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 02 八月 2024 17:16:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/resources/mapper/basicInfo/ParamDataDao.xml | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 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..388ff9c 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">
@@ -48,4 +51,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