From 8a3777e0f2b9fa6c1a38ed64ea03980540d41fe1 Mon Sep 17 00:00:00 2001
From: wanjia <553039491@qq.com>
Date: Mon, 16 Dec 2024 13:46:54 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=95=B0=E6=8D=AE=E5=8F=AF=E8=A7=86?=
 =?UTF-8?q?=E5=8C=96=E7=9B=91=E6=B5=8B):=E5=88=9B=E5=AE=A2=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E8=BF=94=E5=9B=9E=E6=97=B6=E9=97=B4=EF=BC=8C=E5=B7=B2?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=80=BB=E9=87=91=E9=A2=9D=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dss/makerspace/mapper/TasksMapper.java    |  2 +-
 .../dss/makerspace/service/ITasksService.java |  2 +-
 .../service/impl/TasksServiceImpl.java        |  2 +-
 .../main/resources/mapper/dss/TasksMapper.xml | 20 ++++++++++++++-----
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/microservices-modules/microservices-modules-dss/src/main/java/com/microservices/dss/makerspace/mapper/TasksMapper.java b/microservices-modules/microservices-modules-dss/src/main/java/com/microservices/dss/makerspace/mapper/TasksMapper.java
index 264f1577a..053fd3484 100644
--- a/microservices-modules/microservices-modules-dss/src/main/java/com/microservices/dss/makerspace/mapper/TasksMapper.java
+++ b/microservices-modules/microservices-modules-dss/src/main/java/com/microservices/dss/makerspace/mapper/TasksMapper.java
@@ -27,7 +27,7 @@ public interface TasksMapper{
 
     List<Object> getNewAddedPapersByMonth(@Param("startTime") String startTime, @Param("endTime") String endTime);
 
-    List<String> getTaskOperLogTopN(@Param("topNum") Integer topNum);
+    List<Map<String, String>> getTaskOperLogTopN(@Param("topNum") Integer topNum);
 
     List<PieChartNameAndValue> getOpeningTaskNumOfTaskStatus(@Param("topNum") Integer topNum);
 
diff --git a/microservices-modules/microservices-modules-dss/src/main/java/com/microservices/dss/makerspace/service/ITasksService.java b/microservices-modules/microservices-modules-dss/src/main/java/com/microservices/dss/makerspace/service/ITasksService.java
index b147ec69f..fdf7ef693 100644
--- a/microservices-modules/microservices-modules-dss/src/main/java/com/microservices/dss/makerspace/service/ITasksService.java
+++ b/microservices-modules/microservices-modules-dss/src/main/java/com/microservices/dss/makerspace/service/ITasksService.java
@@ -14,7 +14,7 @@ public interface ITasksService {
 
     int[] getPaperAdditionTrendData();
 
-    List<String> getTaskOperLogTopN(Integer topNum);
+    List<Map<String, String>> getTaskOperLogTopN(Integer topNum);
 
     List<PieChartNameAndValue> getOpeningTaskStatusDistribution(Integer topNum);
 
diff --git a/microservices-modules/microservices-modules-dss/src/main/java/com/microservices/dss/makerspace/service/impl/TasksServiceImpl.java b/microservices-modules/microservices-modules-dss/src/main/java/com/microservices/dss/makerspace/service/impl/TasksServiceImpl.java
index d217e477d..56d3fd9fb 100644
--- a/microservices-modules/microservices-modules-dss/src/main/java/com/microservices/dss/makerspace/service/impl/TasksServiceImpl.java
+++ b/microservices-modules/microservices-modules-dss/src/main/java/com/microservices/dss/makerspace/service/impl/TasksServiceImpl.java
@@ -72,7 +72,7 @@ public class TasksServiceImpl implements ITasksService {
     }
 
     @Override
-    public List<String> getTaskOperLogTopN(Integer topNum) {
+    public List<Map<String, String>> getTaskOperLogTopN(Integer topNum) {
         return tasksMapper.getTaskOperLogTopN(topNum);
     }
 
diff --git a/microservices-modules/microservices-modules-dss/src/main/resources/mapper/dss/TasksMapper.xml b/microservices-modules/microservices-modules-dss/src/main/resources/mapper/dss/TasksMapper.xml
index fa7b9956e..9779beb28 100644
--- a/microservices-modules/microservices-modules-dss/src/main/resources/mapper/dss/TasksMapper.xml
+++ b/microservices-modules/microservices-modules-dss/src/main/resources/mapper/dss/TasksMapper.xml
@@ -115,10 +115,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           AND parent_id = 0
         GROUP BY createTime
     </select>
-    <select id="getTaskOperLogTopN" resultType="java.lang.String">
-        select log_desc
-        from task_oper_log
-        order by id desc limit #{topNum}
+    <select id="getTaskOperLogTopN" resultType="map">
+        SELECT
+            log_desc as log_desc,
+            CASE
+                WHEN TIMESTAMPDIFF(MINUTE, oper_time, NOW()) = 0 THEN CONCAT(TIMESTAMPDIFF(SECOND, oper_time, NOW()), '秒前')
+                WHEN TIMESTAMPDIFF(HOUR, oper_time, NOW()) = 0 THEN CONCAT(TIMESTAMPDIFF(MINUTE, oper_time, NOW()), '分钟前')
+                WHEN TIMESTAMPDIFF(DAY, oper_time, NOW()) = 0 THEN CONCAT(TIMESTAMPDIFF(HOUR, oper_time, NOW()), '小时前')
+                ELSE CONCAT(TIMESTAMPDIFF(DAY, oper_time, NOW()), '天前')
+                END AS time_ago
+        FROM
+            task_oper_log
+        ORDER BY
+            id DESC
+            LIMIT #{topNum};
     </select>
 
     <select id="getOpeningTaskNumOfTaskStatus"
@@ -168,7 +178,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         END;
     </select>
     <select id="getTotalCompletedBounty" resultType="map">
-        SELECT SUM(bounty) as '已支付总金额'
+        SELECT SUM(bounty) as 'total_paid_bounty'
         FROM tasks
         WHERE is_delete = 0 AND `status` = 8;
     </select>