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 bec7a24..034513c 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 @@ -30,13 +30,15 @@ public class RepairRemindController extends BaseController { /** * 查询工单提醒列表 + * + * @isRead 不传则读取全部工单提醒,new 读取未读列表, already 读取已读列表 */ @RequiresPermissions(value = {"repair:manage:operator", "member:center:view"}, logical = Logical.OR) @RequestMapping("list") - public R list() { + public R list(String isRead) { startPage(); Long userId = getLoginStaffId(); - return result(repairRemindService.getRepairRemindList(userId)); + return result(repairRemindService.getRepairRemindList(userId, isRead)); } /** 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 316ff0d..08cd767 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 @@ -81,7 +81,7 @@ public class RepairStatsController extends BaseController { * 人员绩效,楼层管理员 * * 支持查询参数: - * username 姓名 + * name 姓名 * mobile 手机号 * adr 地址名称,地点,楼层等 * startDate 工单创建日期范围;开始时间;格式示例 2024-08-22;成对出现 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 b657ddc..57e1fa0 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 @@ -37,7 +37,7 @@ public interface RepairRemindMapper { * @param userId 用户id * @return 工单提醒集合 */ - List getRepairRemindByUserId(Long userId); + List getRepairRemindByUserId(@Param("userId") Long userId, @Param("read") Integer read); /** * 获取最新几条未读提醒 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 ebeb433..3d221de 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 @@ -25,7 +25,7 @@ public interface IRepairRemindService { * @param userId 用户id * @return 工单提醒 */ - List getRepairRemindList(Long userId); + List getRepairRemindList(Long userId, String isRead); /** * 获取最新几条未读提醒 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 f97d81c..f8749f8 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 @@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil; import com.ics.admin.domain.RepairRemind; import com.ics.admin.mapper.RepairRemindMapper; import com.ics.admin.service.IRepairRemindService; +import com.ics.common.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -40,8 +41,13 @@ public class RepairRemindServiceImpl implements IRepairRemindService { * @return 工单提醒 */ @Override - public List getRepairRemindList(Long userId) { - return repairRemindMapper.getRepairRemindByUserId(userId); + public List getRepairRemindList(Long userId, String isRead) { + Integer read = null; + if (StringUtils.isNotBlank(isRead)) { + if ("new".equals(isRead)) read = 0; + if ("already".equals(isRead)) read = 1; + } + return repairRemindMapper.getRepairRemindByUserId(userId, read); } /** 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 d7fadf8..f6a1ae9 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 @@ -30,7 +30,11 @@