From 0392c333ed3d987cb2ab3dac4e1a972cff405f21 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 25 四月 2024 17:42:08 +0800
Subject: [PATCH] 1. 新增后台任务关联模块 2. 新增自动评分后台任务； 3. 修复部分bug
---
src/main/resources/mapper/ds1/MonitorobjectversionMapper.xml | 50 +++++++++++++++++++++++---------------------------
1 files changed, 23 insertions(+), 27 deletions(-)
diff --git a/src/main/resources/mapper/ds1/MonitorobjectversionMapper.xml b/src/main/resources/mapper/ds1/MonitorobjectversionMapper.xml
index f831319..0c2f041 100644
--- a/src/main/resources/mapper/ds1/MonitorobjectversionMapper.xml
+++ b/src/main/resources/mapper/ds1/MonitorobjectversionMapper.xml
@@ -8,43 +8,39 @@
<id column="MOV_ID" property="movId" jdbcType="VARCHAR" />
<result column="T_ID" property="tId" jdbcType="VARCHAR" />
<result column="S_GUID" property="sGuid" jdbcType="VARCHAR" />
- <result column="MOV_SenseName" property="movSensename" jdbcType="VARCHAR" />
- <result column="MOV_TaskTypeID" property="movTasktypeid" jdbcType="TINYINT" />
- <result column="MOV_TaskType" property="movTasktype" jdbcType="VARCHAR" />
- <result column="MOV_MonitorNum" property="movMonitornum" jdbcType="INTEGER" />
- <result column="MOV_Suitable" property="movSuitable" jdbcType="BIT" />
- <result column="MOV_DisplayID" property="movDisplayid" jdbcType="INTEGER" />
- <result column="MOV_Year" property="movYear" jdbcType="INTEGER" />
- <result column="MOV_Month" property="movMonth" jdbcType="INTEGER" />
- <result column="MOV_Day" property="movDay" jdbcType="INTEGER" />
- <result column="MOV_ISCP" property="movIscp" jdbcType="BIT" />
- <result column="MOV_CustomPeriod" property="movCustomperiod" jdbcType="VARCHAR" />
- <result column="MOV_Extension1" property="movExtension1" jdbcType="VARCHAR" />
- <result column="MOV_Extension2" property="movExtension2" jdbcType="VARCHAR" />
- <result column="MOV_Extension3" property="movExtension3" jdbcType="VARCHAR" />
- <result column="MOV_Remark" property="movRemark" jdbcType="VARCHAR" />
+ <result column="MOV_SenseName" property="sensename" jdbcType="VARCHAR" />
+ <result column="MOV_TaskTypeID" property="tasktypeid" jdbcType="TINYINT" />
+ <result column="MOV_TaskType" property="tasktype" jdbcType="VARCHAR" />
+ <result column="MOV_MonitorNum" property="monitornum" jdbcType="INTEGER" />
+ <result column="MOV_Suitable" property="suitable" jdbcType="BIT" />
+ <result column="MOV_DisplayID" property="displayid" jdbcType="INTEGER" />
+ <result column="MOV_Year" property="year" jdbcType="INTEGER" />
+ <result column="MOV_Month" property="month" jdbcType="INTEGER" />
+ <result column="MOV_Day" property="day" jdbcType="INTEGER" />
+ <result column="MOV_ISCP" property="iscp" jdbcType="BIT" />
+ <result column="MOV_CustomPeriod" property="customperiod" jdbcType="VARCHAR" />
+ <result column="MOV_Extension1" property="extension1" jdbcType="VARCHAR" />
+ <result column="MOV_Extension2" property="extension2" jdbcType="VARCHAR" />
+ <result column="MOV_Extension3" property="extension3" jdbcType="VARCHAR" />
+ <result column="MOV_Remark" property="remark" jdbcType="VARCHAR" />
</resultMap>
<sql id="Base_Column_List" >
<!--
WARNING - @mbg.generated
-->
- MOV_ID, T_ID, S_GUID, MOV_SenseName, MOV_TaskTypeID, MOV_TaskType, MOV_MonitorNum,
- MOV_Suitable, MOV_DisplayID, MOV_Year, MOV_Month, MOV_Day, MOV_ISCP, MOV_CustomPeriod,
+ MOV_ID, T_ID, S_GUID, MOV_SenseName, MOV_TaskTypeID, MOV_TaskType, MOV_MonitorNum,
+ MOV_Suitable, MOV_DisplayID, MOV_Year, MOV_Month, MOV_Day, MOV_ISCP, MOV_CustomPeriod,
MOV_Extension1, MOV_Extension2, MOV_Extension3, MOV_Remark
</sql>
- <select id="getSceneByType" resultType="String">
+ <select id="findMonitorListByScene" resultMap="BaseResultMap">
select
- b.S_GUID
+ a.*
from sm_t_monitorobjectversion as a
- left join sm_t_scense as b
- on a.S_GUID = b.S_GUID
- where a.T_ID = #{param1}
- <if test="param2 != null">
- and b.S_TypeID = #{param2}
- </if>
- <if test="param3 != null">
- and b.S_TownCode = #{param3}
+ left join sm_t_scense as b on a.S_GUID = b.S_GUID
+ where T_ID = #{taskId}
+ <if test="sceneTypeId != null">
+ and b.S_TypeID = #{sceneTypeId}
</if>
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3