From 15bbfc6d2dfccca693e70ae2e0866926a7f7aa56 Mon Sep 17 00:00:00 2001
From: wanjia <553039491@qq.com>
Date: Fri, 9 May 2025 09:09:39 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1):?=
 =?UTF-8?q?=E5=88=9B=E5=AE=A2=E4=BB=BB=E5=8A=A1=E6=80=BB=E6=B5=8F=E8=A7=88?=
 =?UTF-8?q?=E9=87=8F=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dss/makerspace/domain/vo/MakerSpaceTotalDataVo.java    | 2 ++
 .../microservices/dss/makerspace/mapper/TasksMapper.java   | 2 ++
 .../dss/makerspace/service/impl/TasksServiceImpl.java      | 1 +
 .../src/main/resources/mapper/dss/TasksMapper.xml          | 7 ++++++-
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/microservices-modules/microservices-modules-dss/src/main/java/com/microservices/dss/makerspace/domain/vo/MakerSpaceTotalDataVo.java b/microservices-modules/microservices-modules-dss/src/main/java/com/microservices/dss/makerspace/domain/vo/MakerSpaceTotalDataVo.java
index 80cf2fa41..1609cdd4a 100644
--- a/microservices-modules/microservices-modules-dss/src/main/java/com/microservices/dss/makerspace/domain/vo/MakerSpaceTotalDataVo.java
+++ b/microservices-modules/microservices-modules-dss/src/main/java/com/microservices/dss/makerspace/domain/vo/MakerSpaceTotalDataVo.java
@@ -16,6 +16,8 @@ public class MakerSpaceTotalDataVo {
 
     private float paidAwardAmount;
 
+    private int totalVisits;
+
     private List<Object> taskPublishedCountsByYear;
 
     private List<Object> taskBountyCountsByYear;
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 8c4751338..c4c276149 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
@@ -46,4 +46,6 @@ public interface TasksMapper{
     Map<String, String> getTaskStatisticsByStatus(@Param("status") Integer status);
 
     List<Map<String, String>> getTaskUserOperLogTopN(@Param("topNum") Integer topNum, @Param("taskLogOperations") String[] taskLogOperations);
+
+    int getTotalVisits();
 }
\ No newline at end of file
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 5a7a52dd9..5daf8103a 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
@@ -42,6 +42,7 @@ public class TasksServiceImpl implements ITasksService {
         makerSpaceTotalDataVo.setTotalApplicants(tasksMapper.getTotalApplicantCount());
         makerSpaceTotalDataVo.setCurrentTotalAwardAmount(tasksMapper.getCurrentTotalAwardAmount()/10000);
         makerSpaceTotalDataVo.setPaidAwardAmount(tasksMapper.getPaidAwardAmount()/10000);
+        makerSpaceTotalDataVo.setTotalVisits(tasksMapper.getTotalVisits());
         makerSpaceTotalDataVo.setTaskPublishedCountsByYear(tasksMapper.getTaskPublishedCountsByYear());
         makerSpaceTotalDataVo.setTaskBountyCountsByYear(tasksMapper.getTaskBountyCountsByYear());
         return makerSpaceTotalDataVo;
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 815217f12..ac93372ba 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
@@ -208,10 +208,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         GROUP BY publish_mode
     </select>
     <select id="getPaidAwardAmount" resultType="java.lang.Float">
-        SELECT SUM(bounty)
+        SELECT COALESCE(SUM(bounty), 0) AS total_bounty
         FROM tasks
         WHERE is_delete = 0 AND `status` = 8 and except_closed_boolean = 0;
     </select>
+    <select id="getTotalVisits" resultType="java.lang.Integer">
+        SELECT COALESCE(SUM(visits), 0) AS total_visits
+        FROM tasks
+        WHERE is_delete = 0;
+    </select>
     <select id="getTaskStatisticsByStatus" resultType="java.util.Map">
         <if test = "status == 3">
             select '成果征集中' AS status,sub1.total_tasks, sub1.total_bounty, sub2.total_applied_papers