From a8ce806c8a81f685fa9fafaa453820197ced9961 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 10 十二月 2024 10:39:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/resources/mapper/taskReliability/ReliabilityAssessDao.xml | 42 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 41 insertions(+), 1 deletions(-)
diff --git a/modules/mainPart/src/main/resources/mapper/taskReliability/ReliabilityAssessDao.xml b/modules/mainPart/src/main/resources/mapper/taskReliability/ReliabilityAssessDao.xml
index c606ba3..e8ea798 100644
--- a/modules/mainPart/src/main/resources/mapper/taskReliability/ReliabilityAssessDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/taskReliability/ReliabilityAssessDao.xml
@@ -2,6 +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.taskReliability.dao.ReliabilityAssessDao">
+ <delete id="deleteByItemId">
+ delete
+ from assess_data
+ where item_id = ${itemId}
+ </delete>
<select id="getProductPath" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel">
select a.*
from product_model a
@@ -9,10 +14,45 @@
and a.ship_id = ${shipId}
</select>
<select id="getAssessDataList" resultType="com.zt.life.modules.mainPart.taskReliability.model.AssessItem">
- select a.name,a.id
+ select a.name, a.id
from assess_item a
where a.IS_DELETE = 0
and a.product_id = ${productId}
order by CREATE_DATE desc
</select>
+ <select id="getProductList"
+ resultType="com.zt.life.modules.mainPart.taskReliability.model.ReliabilityAssess">
+ SELECT a.NAME,
+ a.id,
+ a.pid,
+ a.product_type as type,
+ b.run_num,
+ b.fail_num,
+ b.run_times
+ FROM product_model a
+ LEFT JOIN assess_data b ON b.product_id = a.id
+ AND b.is_delete = 0 AND b.item_id = ${itemId}
+ WHERE a.is_delete = 0
+ AND a.product_type <> 10
+ AND a.ship_id = ${productId}
+ OR a.id = ${productId}
+ ORDER BY a.product_type,
+ a.sort
+ </select>
+ <select id="getAssessId" resultType="java.lang.Long">
+ SELECT id
+ FROM assess_result
+ WHERE is_delete = 0
+ AND item_id = ${itemId}
+ AND product_id = ${productId}
+ AND task_id = ${taskId}
+ ORDER BY UPDATE_DATE DESC
+ LIMIT 1
+ </select>
+ <select id="getxml" resultType="java.lang.String">
+ SELECT xml
+ FROM assess_result
+ WHERE is_delete = 0
+ AND id = ${assessId}
+ </select>
</mapper>
--
Gitblit v1.9.1