boyue2025/dbd-meeting
3
0
Fork 0
mirror of https://gitee.com/elegant_wings/dbd-meeting.git synced 2025-06-21 17:09:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

工单提醒增加已读未读列表

Browse Source
This commit is contained in:
lujiang 2024-08-31 21:31:17 +08:00
parent da8890a2ab
commit e68c607069
6 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairRemindController.java
View File

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

2
shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairStatsController.java
View File

@ -81,7 +81,7 @@ public class RepairStatsController extends BaseController {
* 人员绩效，楼层管理员
*
* 支持查询参数：
* username 姓名
* name 姓名
* mobile 手机号
* adr 地址名称，地点，楼层等
* startDate 工单创建日期范围；开始时间;格式示例 2024-08-22；成对出现

2
shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairRemindMapper.java
View File

@ -37,7 +37,7 @@ public interface RepairRemindMapper {
* @param userId 用户id
* @return 工单提醒集合
*/
List<RepairRemind> getRepairRemindByUserId(Long userId);
List<RepairRemind> getRepairRemindByUserId(@Param("userId") Long userId, @Param("read") Integer read);
/**
* 获取最新几条未读提醒

2
shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairRemindService.java
View File

@ -25,7 +25,7 @@ public interface IRepairRemindService {
* @param userId 用户id
* @return 工单提醒
*/
List<RepairRemind> getRepairRemindList(Long userId);
List<RepairRemind> getRepairRemindList(Long userId, String isRead);
/**
* 获取最新几条未读提醒

10
shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairRemindServiceImpl.java
View File

@ -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<RepairRemind> getRepairRemindList(Long userId) {
return repairRemindMapper.getRepairRemindByUserId(userId);
public List<RepairRemind> 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);
}
/**

6
shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairRemindMapper.xml
View File

@ -30,7 +30,11 @@
<select id="getRepairRemindByUserId" parameterType="RepairRemind" resultMap="RepairRemindResult">
<include refid="selectRepairRemindVo"/>
where user_id=#{userId} and delete_flag=0 order by `read` asc,create_time desc
where user_id=#{userId} and delete_flag=0
<if test="read != null">
AND `read` = #{read}
</if>
order by `read` asc,create_time desc
</select>
<select id="getLatestRepairRemind" parameterType="RepairRemind" resultMap="RepairRemindResult">