From 8688bfa3bba72f0e89520014a67454493b25e416 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期四, 20 三月 2025 10:46:54 +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 | 43 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 42 insertions(+), 1 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 3edcdce..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
@@ -41,11 +41,13 @@
TDMI.CATEGORYID,
TMIS.last_time,
TMIS.status run_status,
- TMIS.duration
+ TMIS.duration,
+ TDMM.modulename
FROM T_MM_PREDICT_ITEM TMPI
LEFT JOIN T_MM_ITEM_TYPE TMIT ON TMIT.ID = TMPI.ITEMTYPEID
LEFT JOIN T_DM_MODULE_ITEM TDMI ON TDMI.ITEMID = TMPI.ID
LEFT JOIN t_mm_item_status TMIS ON TMIS.item_id = TMPI.ID
+ LEFT JOIN T_DM_MODULE TDMM ON TDMM.id = TDMI.moduleid
<where>
<if test="params.itemno != null and params.itemno != ''">
AND TMPI.ITEMNO LIKE CONCAT('%', #{params.itemno},'%')
@@ -62,6 +64,12 @@
<if test="params.status != null and params.status != ''">
AND TMPI.STATUS = #{params.status}
</if>
+ <if test="params.modulename != null and params.modulename != ''">
+ AND TDMM.modulename LIKE CONCAT('%', #{params.modulename},'%')
+ </if>
+ <if test="params.runStatus != null">
+ AND TMIS.status = #{params.runStatus}
+ </if>
</where>
ORDER BY TMPI.CREATE_TIME DESC
</select>
@@ -72,6 +80,7 @@
<result property="itemname" column="ITEMNAME"/>
<result property="itemtypeid" column="ITEMTYPEID"/>
<result property="itemtypename" column="ITEMTYPENAME"/>
+ <result property="predictlength" column="predictlength"/>
<result property="granularity" column="GRANULARITY"/>
<result property="isfuse" column="ISFUSE"/>
<result property="workchecked" column="WORKCHECKED"/>
@@ -79,10 +88,13 @@
<result property="itemorder" column="ITEMORDER"/>
<result property="status" column="STATUS"/>
<result property="categoryid" column="CATEGORYID"/>
+ <result property="lastTime" column="last_time"/>
<collection property="outPuts" ofType="com.iailab.module.model.mcs.pre.vo.MmItemOutputRespVO">
<result property="id" column="out_put_id"/>
<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>
@@ -93,6 +105,7 @@
TMPI.ITEMNAME,
TMPI.ITEMTYPEID,
TMIT.ITEMTYPENAME,
+ TMPI.predictlength,
TMPI.GRANULARITY,
TMPI.ISFUSE,
TMPI.WORKCHECKED,
@@ -181,6 +194,34 @@
FROM t_mm_predict_merge_item t1
WHERE t1.itemid = #{ITEMID}
</select>
+ <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_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 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=",">
+ #{item}
+ </foreach>
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3