From 33d381cae73bc5013ba25b3f1b71817c7ef730fc Mon Sep 17 00:00:00 2001
From: lujiang <ljxuzhou@163.com>
Date: Mon, 19 Aug 2024 20:03:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BB=E5=8F=96=E6=9C=80=E6=96=B05=E6=9D=A1?=
 =?UTF-8?q?=E6=9C=AA=E8=AF=BB=E5=B7=A5=E5=8D=95=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ics/admin/controller/RepairRemindController.java   | 10 ++++++++++
 .../java/com/ics/admin/mapper/RepairRemindMapper.java  | 10 ++++++++++
 .../com/ics/admin/service/IRepairRemindService.java    |  9 +++++++++
 .../admin/service/impl/RepairRemindServiceImpl.java    |  5 +++++
 .../main/resources/mapper/admin/RepairRemindMapper.xml |  5 +++++
 5 files changed, 39 insertions(+)

diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairRemindController.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairRemindController.java
index 4f9680e..de9b4d3 100644
--- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairRemindController.java
+++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairRemindController.java
@@ -39,6 +39,16 @@ public class RepairRemindController extends BaseController {
         return result(repairRemindService.getRepairRemindList(userId));
     }
 
+    /**
+     * 读取最新5条未读工单提醒
+     */
+    @RequiresPermissions(value = {"repair:manage:operator", "member:center:view"}, logical = Logical.OR)
+    @RequestMapping("latestList")
+    public R latestList() {
+        Long userId = getLoginStaffId();
+        return R.ok().put("data", repairRemindService.getLatestRepairRemind(userId, 5));
+    }
+
     /**
      * 工单提醒 变成已读
      */
diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairRemindMapper.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairRemindMapper.java
index 7ac4ff8..d70ae90 100644
--- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairRemindMapper.java
+++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairRemindMapper.java
@@ -12,6 +12,7 @@ import com.ics.admin.domain.RepairRemind;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import javax.persistence.criteria.CriteriaBuilder;
 import java.util.List;
 
 /**
@@ -37,6 +38,15 @@ public interface RepairRemindMapper {
      * @return 工单提醒集合
      */
     List<RepairRemind> getRepairRemindByUserId(Long userId);
+
+    /**
+     * 获取最新几条未读提醒
+     *
+     * @param userId 用户id
+     * @param number 条数
+     * @return 工单提醒集合
+     */
+    List<RepairRemind> getLatestRepairRemind(@Param("userId") Long userId, @Param("number") Integer number);
     /**
      * 已读工单
      * @param repairRemind
diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairRemindService.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairRemindService.java
index 759213d..e76e50e 100644
--- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairRemindService.java
+++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairRemindService.java
@@ -27,6 +27,15 @@ public interface IRepairRemindService {
      */
     List<RepairRemind> getRepairRemindList(Long userId);
 
+    /**
+     * 获取最新几条未读提醒
+     *
+     * @param userId 用户id
+     * @param number 条数
+     * @return 工单提醒集合
+     */
+    List<RepairRemind> getLatestRepairRemind(Long userId, Integer number);
+
     /**
      * 新增工单提醒
      *
diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairRemindServiceImpl.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairRemindServiceImpl.java
index 8b41dba..140c949 100644
--- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairRemindServiceImpl.java
+++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairRemindServiceImpl.java
@@ -53,6 +53,11 @@ public class RepairRemindServiceImpl implements IRepairRemindService {
         return repairRemindMapper.insertRepairRemind(repairRemind);
     }
 
+    @Override
+    public List<RepairRemind> getLatestRepairRemind(Long userId, Integer number) {
+        return repairRemindMapper.getLatestRepairRemind(userId, number);
+    }
+
     /**
      * 工单提醒 变为已读
      *
diff --git a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairRemindMapper.xml b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairRemindMapper.xml
index 3b75c67..159f5fd 100644
--- a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairRemindMapper.xml
+++ b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairRemindMapper.xml
@@ -33,6 +33,11 @@
         where user_id=#{userId} and delete_flag=0 order by `read` asc,create_time desc
     </select>
 
+    <select id="getLatestRepairRemind" parameterType="RepairRemind" resultMap="RepairRemindResult">
+        <include refid="selectRepairRemindVo"/>
+        where user_id=#{userId} and delete_flag=0 and `read`=0 order by create_time desc limit #{number}
+    </select>
+
     <select id="selectRepairRemindById" parameterType="Long" resultMap="RepairRemindResult">
         <include refid="selectRepairRemindVo"/>
         WHERE id = #{id}