From 5cea5dff7f0d73c1b172252936b393fb390ab669 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期六, 12 十月 2024 09:31:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/resources/mapper/taskReliability/OperatConditModelDao.xml | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/modules/mainPart/src/main/resources/mapper/taskReliability/OperatConditModelDao.xml b/modules/mainPart/src/main/resources/mapper/taskReliability/OperatConditModelDao.xml
index 84d252a..84acf4f 100644
--- a/modules/mainPart/src/main/resources/mapper/taskReliability/OperatConditModelDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/taskReliability/OperatConditModelDao.xml
@@ -63,8 +63,18 @@
a.is_delete = 0
and b.is_delete = 0
<if test="productId!=null">
- and b.product_id=${productId}
+ and b.product_id=#{productId}
</if>
ORDER BY a.operat_condit_id, a.product_id
</select>
+ <select id="getGKModelAssembled" resultType="com.zt.life.modules.mainPart.taskReliability.model.OperatConditModel">
+ select
+ a.*
+ FROM
+ operat_condit_model a
+ where
+ a.is_delete = 0
+ and a.is_disabled = 0
+ and a.operat_condit_id=#{gkId}
+ </select>
</mapper>
--
Gitblit v1.9.1