From f770e36d5ec735f53df298445a6940daa20d0bfa Mon Sep 17 00:00:00 2001 From: xyc <jc_xiong@hotmail.com> Date: 星期一, 18 十一月 2024 11:12:05 +0800 Subject: [PATCH] 修复bug:1)一键排版时不要自动保存; 2)无论设备数量多少,deviceNo统一改成从1开始。 --- modules/mainPart/src/main/resources/mapper/taskReliability/ReliabilityAssessDao.xml | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 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..ec76ca8 100644 --- a/modules/mainPart/src/main/resources/mapper/taskReliability/ReliabilityAssessDao.xml +++ b/modules/mainPart/src/main/resources/mapper/taskReliability/ReliabilityAssessDao.xml @@ -15,4 +15,50 @@ 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