From 57c14a7fa624dc6b44968b06d8e630a2e721e943 Mon Sep 17 00:00:00 2001
From: lujiang <ljxuzhou@163.com>
Date: Mon, 19 Aug 2024 19:46:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AE=A1=E7=90=86=E5=91=98?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=8F=90=E9=86=92=E6=95=B0=E9=87=8F=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ics/admin/controller/RepairStatsController.java     | 3 ++-
 .../main/java/com/ics/admin/mapper/RepairStatsMapper.java   | 2 +-
 .../java/com/ics/admin/service/IRepairStatsService.java     | 2 +-
 .../com/ics/admin/service/impl/RepairStatsServiceImpl.java  | 4 ++--
 .../src/main/resources/mapper/admin/RepairStatsMapper.xml   | 6 ++++--
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairStatsController.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairStatsController.java
index ee2c377..4a5093e 100644
--- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairStatsController.java
+++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairStatsController.java
@@ -76,7 +76,8 @@ public class RepairStatsController extends BaseController {
     @RequiresPermissions(value = {"repair:manage:operator"})
     @RequestMapping("repairAdminStats")
     public R repairAdminStats() {
-        RepairAdminStatsVo repairAdminStatsVo = repairWorkerStatsService.repairAdminStats();
+        Long userId = getLoginStaffId();
+        RepairAdminStatsVo repairAdminStatsVo = repairWorkerStatsService.repairAdminStats(userId);
         return R.ok().put("repairAdminStats", repairAdminStatsVo);
     }
 
diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairStatsMapper.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairStatsMapper.java
index 4addadf..da6c93e 100644
--- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairStatsMapper.java
+++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairStatsMapper.java
@@ -40,7 +40,7 @@ public interface RepairStatsMapper {
      * 第一行 管理员 工单与 通知统计
      * @return
      */
-    List<RepairAdminStatsVo> repairAdminStats();
+    List<RepairAdminStatsVo> repairAdminStats(Long userId);
 
     /**
      * 第二、三行  工单统计、工单完成情况、评价情况
diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairStatsService.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairStatsService.java
index 567a9c4..bd71fe9 100644
--- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairStatsService.java
+++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairStatsService.java
@@ -38,7 +38,7 @@ public interface IRepairStatsService {
     /**
      * 第一行 管理员 工单与 通知统计
      */
-    RepairAdminStatsVo repairAdminStats();
+    RepairAdminStatsVo repairAdminStats(Long userId);
 
     /**
      * 第二、三行  工单统计、工单完成情况、评价情况
diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairStatsServiceImpl.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairStatsServiceImpl.java
index 17dcb4b..87bb6a5 100644
--- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairStatsServiceImpl.java
+++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairStatsServiceImpl.java
@@ -55,8 +55,8 @@ public class RepairStatsServiceImpl implements IRepairStatsService {
     }
 
     @Override
-    public RepairAdminStatsVo repairAdminStats() {
-        List<RepairAdminStatsVo> list = repairStatsMapper.repairAdminStats();
+    public RepairAdminStatsVo repairAdminStats(Long userId) {
+        List<RepairAdminStatsVo> list = repairStatsMapper.repairAdminStats(userId);
         if (list != null && list.size() > 0) return list.get(0);
         return null;
     }
diff --git a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairStatsMapper.xml b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairStatsMapper.xml
index df811cf..e6a930c 100644
--- a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairStatsMapper.xml
+++ b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairStatsMapper.xml
@@ -33,9 +33,11 @@
     <!-- 第一行 管理员 工单与 通知统计 -->
     <select id="repairAdminStats" resultType="com.ics.admin.vo.RepairAdminStatsVo">
     <![CDATA[
-      SELECT `wait`,`anew`,0 as newnotice,0 as oldnotice FROM
+      SELECT `wait`,`anew`,newnotice,oldnotice FROM
         (SELECT count(id) as `wait` FROM  ics_repair where delete_flag=0 and status=3) as A,
-        (SELECT count(DISTINCT repair_id) as `anew` FROM  ics_repair_log where delete_flag=0 and node_form=3) as B
+        (SELECT count(DISTINCT repair_id) as `anew` FROM  ics_repair_log where delete_flag=0 and node_form=3) as B,
+        (select count(id) as newnotice from ics_repair_remind where `read`=0 and user_id= #{userId}) C,
+        (select count(id) as oldnotice from ics_repair_remind where `read`=1 and user_id= #{userId}) D
     ]]>
     </select>