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 getNewAddedPapersByMonth(@Param("startTime") String startTime, @Param("endTime") String endTime); - List getTaskOperLogTopN(@Param("topNum") Integer topNum); + List> getTaskOperLogTopN(@Param("topNum") Integer topNum); List 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 getTaskOperLogTopN(Integer topNum); + List> getTaskOperLogTopN(Integer topNum); List 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 getTaskOperLogTopN(Integer topNum) { + public List> 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 + 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 SUM(bounty) as '已支付总金额' + SELECT SUM(bounty) as 'total_paid_bounty' FROM tasks WHERE is_delete = 0 AND `status` = 8;