From cbcfed53175c4ded8f5214f51e80ea6907f92dba Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 10 Oct 2022 09:48:24 +0800
Subject: [PATCH] 事件管理生成维修工单添加图片和视频

---
 src/main/java/org/springblade/modules/taskinfo/mapper/TaskInfoMapper.xml |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/springblade/modules/taskinfo/mapper/TaskInfoMapper.xml b/src/main/java/org/springblade/modules/taskinfo/mapper/TaskInfoMapper.xml
index d152c01..8c4f15e 100644
--- a/src/main/java/org/springblade/modules/taskinfo/mapper/TaskInfoMapper.xml
+++ b/src/main/java/org/springblade/modules/taskinfo/mapper/TaskInfoMapper.xml
@@ -23,14 +23,20 @@
 
     <select id="getTaskInfoOne" resultMap="taskinfoResultMap">
         select id,title,start_time,end_time,content,to_user_id,ST_ASTEXT(route_range) as route_range,
-               state,source,create_user,create_time,update_user,update_time,status,is_deleted from ins_taskinfo
+               state,source,create_user,create_time,update_user,update_time,status,create_dept,is_deleted from ins_taskinfo
         where id = #{id} and is_deleted = 0
     </select>
 
     <select id="selectTaskInfoPage" resultMap="taskinfoResultMap">
-        select id,title,start_time,end_time,content,to_user_id,ST_ASTEXT(route_range) as route_range,state,source,create_user,create_time,update_user,update_time,status,is_deleted from ins_taskinfo where is_deleted = 0
+        select id,title,start_time,end_time,content,to_user_id,ST_ASTEXT(route_range) as route_range,state,source,create_user,create_time,update_user,update_time,status,create_dept,is_deleted from ins_taskinfo where is_deleted = 0
         <if test="taskinfo.title != null and taskinfo.title != '' ">
             and title like concat('%',#{taskinfo.title},'%')
+        </if>
+        <if test="taskinfo.state != null and taskinfo.state != '' ">
+            and state = #{taskinfo.state}
+        </if>
+        <if test="taskinfo.toUserId != null and taskinfo.toUserId != '' ">
+            and to_user_id = #{taskinfo.toUserId}
         </if>
         <if test="taskinfo.startTime != null ">
             and start_time >= #{taskinfo.startTime}
@@ -40,9 +46,9 @@
         </if>
     </select>
 
-    <!--自定义新增农场围栏数据-->
+    <!--自定义新增数据-->
     <insert id="saveTask">
-        INSERT INTO ins_taskinfo (id, title, start_time, end_time, content,to_user_id
+        INSERT INTO ins_taskinfo (id, title, start_time, end_time, content,to_user_id,
         <if test="taskInfo.routeRange!=null and taskInfo.routeRange!=''">
                                   route_range,
         </if>
@@ -54,7 +60,7 @@
             ST_GeomFromText(${taskInfo.routeRange}),
         </if>
          #{taskInfo.state},#{taskInfo.source},#{taskInfo.createUser},#{taskInfo.createDept},#{taskInfo.createTime},
-         #{taskInfo.updataUser},#{taskInfo.updateTime},#{taskInfo.status},#{taskInfo.isDeleted},#{taskInfo.tenantId})
+         #{taskInfo.updateUser},#{taskInfo.updateTime},#{taskInfo.status},#{taskInfo.isDeleted},#{taskInfo.tenantId})
     </insert>
 
     <update id="updateTask">

--
Gitblit v1.9.3