From ca7c541167511b93d6688df0ce5767cfa2f0c1e9 Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期一, 18 十一月 2024 13:31:27 +0800
Subject: [PATCH] datetime
---
iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mcs/MmPredictItemDao.xml | 64 +++++++++++++++-----------------
1 files changed, 30 insertions(+), 34 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..5bda3f9 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
@@ -14,6 +14,7 @@
<result property="isFuse" column="ISFUSE"/>
<result property="predictPhase" column="PREDICTPHASE"/>
<result property="workChecked" column="WORKCHECKED"/>
+ <result property="lastTime" column="last_time"/>
</resultMap>
<resultMap id="MergeItemVO" type="com.iailab.module.model.mdk.vo.MergeItemVO">
@@ -38,15 +39,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,32 +78,26 @@
TMPI.WORKCHECKED,
TDMI.MODULEID,
TDMI.ITEMORDER,
- TDMI.STATUS,
- TDMI.CATEGORYID,
- TMIO.POINTID,
- TMIO.TAGNAME,
- TMIO.RESULTTABLEID,
- TMRT.TABLENAME
+ TMPI.STATUS,
+ TDMI.CATEGORYID
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
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>
@@ -142,17 +135,20 @@
t1.status,
t1.isfuse,
t1.predictphase,
- t1.workchecked
+ t1.workchecked,
+ t3.last_time
FROM
- ${TABLESCHEMA}.t_mm_predict_item t1,
- ${TABLESCHEMA}.t_mm_item_type t2
- WHERE t1.itemtypeid=t2.id
- <if test="ITEMID != null and ITEMID != ''">
- AND t1.id=#{ITEMID}
- </if>
- <if test="ITEMNO != null and ITEMNO != ''">
- t1.itemno=#{ITEMNO}
- </if>
+ t_mm_predict_item t1
+ LEFT JOIN t_mm_item_type t2 on t2.id = t1.itemtypeid
+ LEFT JOIN t_mm_item_status t3 on t3.item_id = t1.id
+ <where>
+ <if test="ITEMID != null and ITEMID != ''">
+ AND t1.id=#{ITEMID}
+ </if>
+ <if test="ITEMNO != null and ITEMNO != ''">
+ t1.itemno=#{ITEMNO}
+ </if>
+ </where>
</select>
<select id="getMergeItemByItemId" parameterType="map" resultMap="MergeItemVO">
SELECT t1.id,
--
Gitblit v1.9.3