From aff23c9de462032adbd908c08a8651c88fdb31d2 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期三, 28 十二月 2022 11:47:33 +0800
Subject: [PATCH] fix: 群消息查询问题
---
src/main/java/com/example/jz/service/impl/ReportServiceImpl.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/example/jz/service/impl/ReportServiceImpl.java b/src/main/java/com/example/jz/service/impl/ReportServiceImpl.java
index 659c1f2..37e6ee6 100644
--- a/src/main/java/com/example/jz/service/impl/ReportServiceImpl.java
+++ b/src/main/java/com/example/jz/service/impl/ReportServiceImpl.java
@@ -34,9 +34,9 @@
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
-import java.util.Comparator;
import java.util.Date;
import java.util.List;
+import java.util.stream.Collectors;
/**
* 鎶ユ琛�(Report)琛ㄦ湇鍔″疄鐜扮被
@@ -74,16 +74,19 @@
* @return
*/
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public Boolean audit(Report report) {
// 1. 鏇存柊鎶ユ琛�
report.setStatus(1);
+ report.setIsInGroup(1);
reportDao.updateById(report);
// 2. 鏇存柊缇ょ敤鎴疯〃
Group group = groupDao.selectOne(new LambdaQueryWrapper<>(Group.class)
.eq(Group::getCauseId, report.getCauseId()));
- GroupUser groupUser = new GroupUser().setGroupId(group.getId()).setUserId(report.getId()).setCtime(new Date()).setBanSpeech(0);
- groupUserDao.insert(groupUser);
+ if (!groupUserDao.selectUserList(group.getId()).contains(report.getUserId())) {
+ GroupUser groupUser = new GroupUser().setGroupId(group.getId()).setUserId(report.getId()).setCtime(new Date()).setBanSpeech(0);
+ return groupUserDao.insert(groupUser) == 1 ? true : false;
+ }
return true;
}
@@ -153,10 +156,7 @@
@Override
public Page<ReportListVo> getPage(Page<ReportListVo> page, ReportParamDto reportParamDto) {
- Page<ReportListVo> aaa = reportDao.getPage(page, reportParamDto);
- aaa.getRecords().stream()
- .forEach(x -> x.setIdcard(x.getIdcard().replaceAll("(?<=[\\d]{3})\\d(?=[\\d]{4})", "*")));
- return aaa;
+ return reportDao.getPage(page, reportParamDto);
}
@Override
@@ -206,9 +206,14 @@
.setCtime(new Date())
.setStatus(0)
.setIsInGroup(0)
- .setReportMethod("鐜板満褰曞叆")
+ .setReportMethod("鍚庡彴褰曞叆")
.setIsCommission("0").setReportTime(new Date())
.setCauseId(addReportDto.getCauseId());
return reportService.save(report);
}
+
+ @Override
+ public List<Report> listGroup(Integer id) {
+ return reportDao.selectListGroup(id);
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0