From 3249419e192b8ca3c31e5d14a2daac3a4a2352c6 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期一, 14 八月 2023 09:59:25 +0800
Subject: [PATCH] app任务下发增加任务类型0-普通任务 1-报警任务

---
 ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml b/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml
index 1f65a23..f002cdf 100644
--- a/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml
+++ b/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml
@@ -6,6 +6,7 @@
 
     <resultMap type="ArdAppTask" id="ArdAppTaskResult">
         <result property="id" column="id"/>
+        <result property="type" column="type"/>
         <result property="name" column="name"/>
         <result property="text" column="text"/>
         <result property="voice" column="voice"/>
@@ -58,6 +59,7 @@
 
     <sql id="selectArdAppTaskVo">
         select c.id,
+               c.type,
                c.name,
                c.text,
                c.voice,
@@ -73,6 +75,7 @@
     </sql>
     <sql id="selectArdAppTaskDto">
         select a.id,
+               a.type,
                a.name,
                a.text,
                a.voice,
@@ -108,6 +111,7 @@
     <select id="selectArdAppTaskList" parameterType="ArdAppTask" resultMap="ArdAppTaskResult">
         <include refid="selectArdAppTaskVo"/>
         <where>
+            <if test="type != null  and type != ''">and c.type = #{type}</if>
             <if test="name != null  and name != ''">and c.name like '%'||#{name}||'%'</if>
             <if test="text != null  and text != ''">and c.text = #{text}</if>
             <if test="voice != null  and voice != ''">and c.voice = #{voice}</if>
@@ -188,6 +192,7 @@
         insert into ard_app_task
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
+            <if test="type != null">type,</if>
             <if test="name != null">name,</if>
             <if test="text != null">text,</if>
             <if test="voice != null">voice,</if>
@@ -200,6 +205,7 @@
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
+            <if test="type != null">#{type},</if>
             <if test="name != null">#{name},</if>
             <if test="text != null">#{text},</if>
             <if test="voice != null">#{voice},</if>
@@ -215,6 +221,7 @@
     <update id="updateArdAppTask" parameterType="ArdAppTask">
         update ard_app_task
         <trim prefix="SET" suffixOverrides=",">
+            <if test="type != null">type = #{type},</if>
             <if test="name != null">name = #{name},</if>
             <if test="text != null">text = #{text},</if>
             <if test="voice != null">voice = #{voice},</if>

--
Gitblit v1.9.3