From 8db139aadb7eaa5803f617d27a4917de727c9fb1 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期日, 30 七月 2023 11:53:11 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/entity/data/TaskEntity.java |   40 ++++++++++++++++++++++++++++++++++++++++
 src/main/resources/mapper/data/TaskMapper.xml           |    5 +++--
 2 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/lf/server/entity/data/TaskEntity.java b/src/main/java/com/lf/server/entity/data/TaskEntity.java
index a361a9d..10dab8b 100644
--- a/src/main/java/com/lf/server/entity/data/TaskEntity.java
+++ b/src/main/java/com/lf/server/entity/data/TaskEntity.java
@@ -40,6 +40,14 @@
 
     private Timestamp updateTime;
 
+    private String depName;
+
+    private String dirName;
+
+    private String createName;
+
+    private String updateName;
+
     public TaskEntity() {
     }
 
@@ -162,4 +170,36 @@
     public void setUpdateTime(Timestamp updateTime) {
         this.updateTime = updateTime;
     }
+
+    public String getDepName() {
+        return depName;
+    }
+
+    public void setDepName(String depName) {
+        this.depName = depName;
+    }
+
+    public String getDirName() {
+        return dirName;
+    }
+
+    public void setDirName(String dirName) {
+        this.dirName = dirName;
+    }
+
+    public String getCreateName() {
+        return createName;
+    }
+
+    public void setCreateName(String createName) {
+        this.createName = createName;
+    }
+
+    public String getUpdateName() {
+        return updateName;
+    }
+
+    public void setUpdateName(String updateName) {
+        this.updateName = updateName;
+    }
 }
diff --git a/src/main/resources/mapper/data/TaskMapper.xml b/src/main/resources/mapper/data/TaskMapper.xml
index 07fefff..22e2e11 100644
--- a/src/main/resources/mapper/data/TaskMapper.xml
+++ b/src/main/resources/mapper/data/TaskMapper.xml
@@ -11,13 +11,14 @@
     </select>
 
     <select id="selectByPage" resultType="com.lf.server.entity.data.TaskEntity">
-        select * from lf.sys_task
+        select a.*, fn_get_fullname(a.depcode, 1) depName, fn_get_fullname(a.dircode, 2) dirName, fn_uname(create_user) createName, fn_uname(update_user) updateName
+        from lf.sys_task a
         <where>
             <if test="name != null">
                 upper(name) like #{name}
             </if>
         </where>
-        order by id desc
+        order by a.id desc
         limit #{limit} offset #{offset}
     </select>
 

--
Gitblit v1.9.3