From d759812b05ceffc6021dee9ebf61bc0c22472df3 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期三, 28 十二月 2022 17:41:37 +0800
Subject: [PATCH] fix: 导入和报案方式
---
src/main/java/com/example/jz/controller/WxAppController.java | 34 +++++++++++++++-------------------
1 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/example/jz/controller/WxAppController.java b/src/main/java/com/example/jz/controller/WxAppController.java
index 3b3a25a..c936a00 100644
--- a/src/main/java/com/example/jz/controller/WxAppController.java
+++ b/src/main/java/com/example/jz/controller/WxAppController.java
@@ -164,7 +164,7 @@
report.setIsInGroup(0);
report.setCtime(new Date());
report.setStatus(0);
- report.setReportMethod("鐜板満褰曞叆");
+ report.setReportMethod("鎵爜鎶ユ");
return R.ok(reportService.save(report));
}
@@ -183,15 +183,7 @@
HashMap<String, Object> groupMap = new HashMap<>();
List<Message> message = messageService.list(new QueryWrapper<Message>().eq("group_id", item.getId()).orderByDesc("ctime"));
groupMap.put("groupName", item.getGroupName());
- if (message != null && message.size() != 0) {
- groupMap.put("message", message.get(0).getText());
- if (message.get(0).getUserId() == null) {
- groupMap.put("name", userDao.selectOne(new QueryWrapper<User>().eq("id", message.get(0).getCopId())).getRealName());
- } else {
- groupMap.put("name", message.get(0).getReportName());
- }
- groupMap.put("time", message.get(0).getCtime());
- }
+ getMessage(groupMap, message);
if (StringUtils.isNotBlank(lastDate)) {
int count = messageService.count(new QueryWrapper<Message>().eq("group_id", item.getId()).between("ctime", lastDate, newDate));
groupMap.put("count", count);
@@ -201,6 +193,18 @@
});
}
return R.ok(list);
+ }
+
+ private void getMessage(HashMap<String, Object> groupMap, List<Message> message) {
+ if (!message.isEmpty()) {
+ groupMap.put("message", message.get(0).getText());
+ if (message.get(0).getUserId() == null) {
+ groupMap.put("name", userDao.selectOne(new QueryWrapper<User>().eq("id", message.get(0).getCopId())).getRealName());
+ } else {
+ groupMap.put("name", message.get(0).getReportName());
+ }
+ groupMap.put("time", message.get(0).getCtime());
+ }
}
@@ -214,15 +218,7 @@
if (groupUser != null) {
HashMap<String, Object> groupMap = new HashMap<>();
List<Message> message = messageService.list(new QueryWrapper<Message>().eq("group_id", groupUser.getGroupId()).orderByDesc("ctime"));
- if (!message.isEmpty()) {
- groupMap.put("message", message.get(0).getText());
- if (message.get(0).getUserId() == null) {
- groupMap.put("name", userDao.selectOne(new QueryWrapper<User>().eq("id", message.get(0).getCopId())).getRealName());
- } else {
- groupMap.put("name", message.get(0).getReportName());
- }
- groupMap.put("time", message.get(0).getCtime());
- }
+ getMessage(groupMap, message);
Group group = groupService.getOne(new QueryWrapper<Group>().eq("id", groupUser.getGroupId()));
groupMap.put("groupName", group.getGroupName());
groupMap.put("id", group.getId());
--
Gitblit v1.8.0