wanjia9506
/
microservices
forked from Gitlink/microservices
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(数据可视化监测):创客日志返回时间，已支付总金额字段修改

This commit is contained in:
wanjia 2024-12-16 13:46:54 +08:00
parent f3d772feb6
commit 8a3777e0f2
4 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
microservices-modules/microservices-modules-dss/src/main/java/com/microservices/dss/makerspace/mapper/TasksMapper.java
View File

@ -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);

2
microservices-modules/microservices-modules-dss/src/main/java/com/microservices/dss/makerspace/service/ITasksService.java
View File

@ -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);

2
microservices-modules/microservices-modules-dss/src/main/java/com/microservices/dss/makerspace/service/impl/TasksServiceImpl.java
View File

@ -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);
}

20
microservices-modules/microservices-modules-dss/src/main/resources/mapper/dss/TasksMapper.xml
View File

@ -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>