From 98375f07478e653b736e298dc527a23a4e64cee8 Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Thu, 13 Oct 2022 16:28:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=86=20=202022-?=
 =?UTF-8?q?10-13=20sxm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/taskmanage/TaskDatailDao.xml | 10 +++++++---
 src/main/resources/mapper/taskmanage/TaskListDao.xml   |  3 +++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/taskmanage/TaskDatailDao.xml b/src/main/resources/mapper/taskmanage/TaskDatailDao.xml
index bc095b7..d451924 100644
--- a/src/main/resources/mapper/taskmanage/TaskDatailDao.xml
+++ b/src/main/resources/mapper/taskmanage/TaskDatailDao.xml
@@ -18,7 +18,7 @@
         select td.id
         , tl.project
         , tl.customer
-        , tl.task_initiator
+        , isnull(u2.username,tl.task_initiator) task_initiator
         , tl.task_description
         , td.department
         , tl.required_completion_date
@@ -36,6 +36,7 @@
         from task_detail td
         left join task_list tl on td.task_id = tl.id AND td.site = tl.site
         left join users u on td.site = u.site and u.userId = td.responsible_person
+        left join users u2 on td.site = u.site and u.userId = tl.task_initiator
         <where>
             td.site = #{site}
             <if test="department != null and department != ''">
@@ -44,14 +45,17 @@
             <if test="customer != null and customer != ''">
                 and tl.customer like #{customer}
             </if>
+            <if test="project != null and project != ''">
+                and tl.project like #{project}
+            </if>
             <if test="status != null and status != ''">
-                and tl.status = #{status}
+                and td.status = #{status}
             </if>
             <if test="finalStatus != null and finalStatus != ''">
                 and td.final_status = #{finalStatus}
             </if>
             <if test="responsiblePerson != null and responsiblePerson != ''">
-                and UPPER(td.responsible_person) like UPPER(#{responsiblePerson})
+                and UPPER(u.username) like UPPER(#{responsiblePerson})
             </if>
             <if test="startDate !=null ">
                 and tl.task_start_date  <![CDATA[ >= ]]> #{startDate}
diff --git a/src/main/resources/mapper/taskmanage/TaskListDao.xml b/src/main/resources/mapper/taskmanage/TaskListDao.xml
index 2bdf10c..988237d 100644
--- a/src/main/resources/mapper/taskmanage/TaskListDao.xml
+++ b/src/main/resources/mapper/taskmanage/TaskListDao.xml
@@ -50,6 +50,9 @@
             <if test="status != null and status != ''">
                 and status = #{status}
             </if>
+            <if test="project != null and project != ''">
+                and project = #{project}
+            </if>
             <if test="responsiblePerson != null and responsiblePerson != ''">
                 and responsible_person like #{responsiblePerson}
             </if>