From 568b782afa3be4b55f617e7330aa1f2c0e54e693 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 27 Jun 2022 09:03:01 +0800
Subject: [PATCH] 地块管理

---
 src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml |   28 ++++++++++++++++++++++++++--
 1 files changed, 26 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 57ea9d6..5c39eb5 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.Task">
+    <resultMap id="taskResultMap" type="org.springblade.modules.task.vo.TaskVO">
         <result column="id" property="id"/>
         <result column="create_user" property="createUser"/>
         <result column="create_dept" property="createDept"/>
@@ -21,11 +21,35 @@
         <result column="remark" property="remark"/>
         <result column="tp" property="tp"/>
         <result column="farm" property="farm"/>
+        <result column="landname" property="landname"/>
     </resultMap>
 
 
     <select id="selectTaskPage" resultMap="taskResultMap">
-        select * from sys_task where is_deleted = 0
+        select t.*, l.land_name as landname,f.agricultural_name as argname,
+        u.real_name as reaname
+        from sys_task t
+        LEFT JOIN sys_land l ON t.land_id = l.id
+        LEFT JOIN sys_stockfactory f ON f.id=t.stock_id
+        LEFT JOIN blade_user u ON u.id=t.task_user
+        where t.is_deleted = 0
+        <if test="task.status!=null and task.status!=''">
+            and t.status=#{task.status}
+        </if>
+        <if test="task.taskUser!=null and task.taskUser!=''">
+            and t.create_user=#{task.taskUser}
+        </if>
+        <if test="task.createUser!=null and task.createUser!=''">
+            and t.create_user=#{task.createUser}
+        </if>
     </select>
 
+    <!--统计待处理任务数量-->
+    <select id="selectCount" resultType="java.lang.Integer">
+        SELECT COUNT(*)
+        FROM `sys_task`
+        WHERE status = 2
+          AND is_deleted = 0
+          AND task_user = #{taskuser}
+    </select>
 </mapper>

--
Gitblit v1.9.3