From 6b14cf7b6b0b53cbfcdec105a9984fd5b1a6778a Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 10 Nov 2023 17:28:35 +0800
Subject: [PATCH] 标签报事+通知公告

---
 src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml |   25 +++++++++++++++++++++++--
 1 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
index 5d3514c..b323a6e 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="org.springblade.modules.task.mapper.TaskMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="taskResultMap" type="org.springblade.modules.task.entity.TaskEntity">
+    <resultMap id="taskResultMap" type="org.springblade.modules.task.vo.TaskVO">
         <result column="id" property="id"/>
         <result column="name" property="name"/>
         <result column="type" property="type"/>
@@ -20,7 +20,28 @@
 
 
     <select id="selectTaskPage" resultMap="taskResultMap">
-        select * from jczz_task where is_deleted = 0
+        SELECT
+        jt.`status`,
+        jt.`id`,
+        jt.`name`,
+        jt.frequency,
+        jda.address_name,
+        jt.create_time
+        FROM
+        jczz_grid jg
+        LEFT JOIN jczz_grid_range jgr ON jg.id = jgr.grid_id
+        LEFT JOIN jczz_task jt ON jgr.house_code = jt.house_code
+        LEFT JOIN jczz_doorplate_address jda on jda.address_code=jt.house_code
+        WHERE
+        jg.user_id = #{task.userId}
+        <if test="task.status != null">
+            and jt.status = #{task.status}
+        </if>
+        <if test="task.name != null and task.name != ''">
+            and jt.name like concat('%', #{task.name}, '%')
+        </if>
+        order by jt.create_time desc
+
     </select>
 
 

--
Gitblit v1.9.3