From 7ea5eece501c98a91555a5358931367e78e9d23b Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期四, 25 五月 2023 15:40:09 +0800
Subject: [PATCH] 11
---
src/main/java/com/example/jz/controller/WxAppController.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/example/jz/controller/WxAppController.java b/src/main/java/com/example/jz/controller/WxAppController.java
index 4b74b69..dcb2d28 100644
--- a/src/main/java/com/example/jz/controller/WxAppController.java
+++ b/src/main/java/com/example/jz/controller/WxAppController.java
@@ -29,6 +29,7 @@
import org.springframework.web.client.RestTemplate;
import javax.annotation.Resource;
+import java.io.Serializable;
import java.sql.Array;
import java.util.*;
import java.util.function.Function;
@@ -438,6 +439,7 @@
messageMap.put("sex", user.getSex());
messageMap.put("pic", user.getPic());
messageMap.put("role", 0);
+ messageMap.put("remark", user.getUserMemo());
} else {
messageMap.put("id", item.getCopId());
User user = userService.getOne(new QueryWrapper<User>().eq("id", item.getCopId()));
@@ -630,6 +632,9 @@
@GetMapping("/manager/report")
public R queryReport(@RequestParam Integer id) {
List<Integer> collect = causeService.list(Wrappers.<Cause>lambdaQuery().eq(Cause::getUserId, id)).stream().map(cause -> cause.getId()).collect(Collectors.toList());
+ if (collect==null || collect.size() == 0){
+ return R.ok();
+ }
R<List<ReportVo>> ok = R.ok(reportService.list(new LambdaQueryWrapper<Report>().eq(Report::getStatus, 0).in(Report::getCauseId, collect))
.stream()
.map(item -> {
@@ -651,11 +656,17 @@
public R queryPublicity(@RequestParam(required = false) Integer size) {
List<Publicity> publicityList = publicityService.list(new LambdaQueryWrapper<Publicity>().eq(Publicity::getStatus, 1));
if (size != null) {
- return R.ok(publicityList.stream().limit(size));
+ return R.ok(publicityList.stream().sorted((o1, o2) -> o2.getReleaseTime().compareTo(o1.getReleaseTime())).limit(size));
}
return R.ok(publicityList);
}
+ @GetMapping("/publicity/{id}")
+ @ApiOperation("閫氳繃涓婚敭鏌ヨ鍗曟潯鏁版嵁")
+ public R<Publicity> selectOne(@PathVariable Serializable id) {
+ return R.ok(publicityService.getById(id));
+ }
+
@ApiOperation(httpMethod = "POST", value = "缇ゅ叕鍛婃坊鍔�")
@PostMapping("/announcement/add")
public R insert(@RequestParam(value = "groupId") Integer groupId, @RequestParam String announcement) {
--
Gitblit v1.8.0