From e013bf101ad9ab326a85c3811f27e352737c6e81 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期六, 18 一月 2025 10:31:25 +0800
Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/iailab-plat
---
iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mcs/MmPredictItemDao.xml | 37 +++++++++++++++++++++----------------
1 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mcs/MmPredictItemDao.xml b/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mcs/MmPredictItemDao.xml
index 940250c..61fc269 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mcs/MmPredictItemDao.xml
+++ b/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mcs/MmPredictItemDao.xml
@@ -94,6 +94,7 @@
<result property="outputorder" column="out_put_order"/>
<result property="resultName" column="result_name"/>
<result property="resultstr" column="result_str"/>
+ <result property="resultIndex" column="result_index"/>
</collection>
</resultMap>
@@ -193,24 +194,28 @@
FROM t_mm_predict_merge_item t1
WHERE t1.itemid = #{ITEMID}
</select>
- <select id="getDoubleOutPutsByItemNos" resultMap="MmPredictItemRespVO" parameterType="map">
+ <select id="getOutPutsByItemNosAndResultType" resultMap="MmPredictItemRespVO" parameterType="map">
SELECT
- TMPI.ID,
- TMPI.ITEMNO,
- TMPI.ITEMNAME,
- TMPI.ITEMTYPEID,
- TMPI.predictlength,
- TMPI.GRANULARITY,
- TMPI.ISFUSE,
- TMPI.WORKCHECKED,
- TMPI.STATUS,
- TMIO.id out_put_id,
- TMIO.outputorder out_put_order,
- TMIO.resultstr result_str,
- TMIO.result_name,
- TMIS.last_time
+ TMPI.ID,
+ TMPI.ITEMNO,
+ TMPI.ITEMNAME,
+ TMPI.ITEMTYPEID,
+ TMPI.predictlength,
+ TMPI.GRANULARITY,
+ TMPI.ISFUSE,
+ TMPI.WORKCHECKED,
+ TMPI.STATUS,
+ TMIO.id out_put_id,
+ TMIO.outputorder out_put_order,
+ TMIO.resultstr result_str,
+ TMIO.result_index,
+ TMIO.result_name,
+ TMIS.last_time
FROM T_MM_PREDICT_ITEM TMPI
- LEFT JOIN t_mm_item_output TMIO ON TMIO.itemid = TMPI.ID AND TMIO.result_type = 3
+ LEFT JOIN t_mm_item_output TMIO ON TMIO.itemid = TMPI.ID AND TMIO.result_type in
+ <foreach collection="resultType" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
LEFT JOIN t_mm_item_status TMIS ON TMIS.item_id = TMPI.ID
WHERE TMPI.itemno in
<foreach collection="itemNos" item="item" open="(" close=")" separator=",">
--
Gitblit v1.9.3