From ed8fc5f674544d3af63c6f68093ffc038385c493 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期一, 16 十二月 2024 09:30:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mcs/MmPredictItemDao.xml | 7 ++++++-
1 files changed, 6 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 363f3e6..5b72ac8 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,9 @@
<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>
</where>
ORDER BY TMPI.CREATE_TIME DESC
</select>
--
Gitblit v1.9.3