From 1337f249608bcbd7ad6cf244870e560a95821727 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 12 十一月 2024 11:30:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mcs/MmPredictItemDao.xml | 36 +++++++++++++++++-------------------
1 files changed, 17 insertions(+), 19 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 f3ba08e..f2d2572 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
@@ -38,15 +38,13 @@
TDMI.ITEMORDER,
TMPI.STATUS,
TDMI.CATEGORYID,
- TMIO.POINTID,
- TMIO.TAGNAME,
- TMIO.RESULTTABLEID,
- TMRT.TABLENAME
+ TMIS.last_time,
+ TMIS.status run_status,
+ TMIS.duration
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_OUTPUT TMIO ON TMIO.ITEMID = TMPI.ID
- LEFT JOIN T_MM_RESULT_TABLE TMRT ON TMRT.ID = TMIO.RESULTTABLEID
+ LEFT JOIN t_mm_item_status TMIS ON TMIS.item_id = TMPI.ID
<where>
<if test="params.itemno != null and params.itemno != ''">
AND TMPI.ITEMNO LIKE CONCAT('%', #{params.itemno},'%')
@@ -79,7 +77,7 @@
TMPI.WORKCHECKED,
TDMI.MODULEID,
TDMI.ITEMORDER,
- TDMI.STATUS,
+ TMPI.STATUS,
TDMI.CATEGORYID,
TMIO.POINTID,
TMIO.TAGNAME,
@@ -91,20 +89,20 @@
LEFT JOIN T_MM_ITEM_OUTPUT TMIO ON TMIO.ITEMID = TMPI.ID
LEFT JOIN T_MM_RESULT_TABLE TMRT ON TMRT.ID = TMIO.RESULTTABLEID
WHERE 1 = 1
- <if test="params.itemno != null and params.itemno != ''">
- AND TMPI.ITEMNO LIKE CONCAT('%', #{params.itemno},'%')
+ <if test="itemno != null and itemno != ''">
+ AND TMPI.ITEMNO LIKE CONCAT('%', #{itemno},'%')
</if>
- <if test="params.itemname != null and params.itemname != ''">
- AND TMPI.ITEMNAME LIKE CONCAT('%', #{params.itemname},'%')
+ <if test="itemname != null and itemname != ''">
+ AND TMPI.ITEMNAME LIKE CONCAT('%', #{itemname},'%')
</if>
- <if test="params.itemtypeid != null and params.itemtypeid != ''">
- AND TMPI.ITEMTYPEID = #{params.itemtypeid}
+ <if test="itemtypeid != null and itemtypeid != ''">
+ AND TMPI.ITEMTYPEID = #{itemtypeid}
</if>
- <if test="params.itemtypename != null and params.itemtypename != ''">
- AND TMIT.ITEMTYPENAME = #{params.itemtypename}
+ <if test="itemtypename != null and itemtypename != ''">
+ AND TMIT.ITEMTYPENAME = #{itemtypename}
</if>
- <if test="params.status != null and params.status != ''">
- AND TDMI.STATUS = #{params.status}
+ <if test="status != null and status != ''">
+ AND TMPI.STATUS = #{status}
</if>
ORDER BY TMPI.CREATE_TIME DESC
</select>
@@ -144,8 +142,8 @@
t1.predictphase,
t1.workchecked
FROM
- ${TABLESCHEMA}.t_mm_predict_item t1,
- ${TABLESCHEMA}.t_mm_item_type t2
+ t_mm_predict_item t1,
+ t_mm_item_type t2
WHERE t1.itemtypeid=t2.id
<if test="ITEMID != null and ITEMID != ''">
AND t1.id=#{ITEMID}
--
Gitblit v1.9.3