From 744cd0a3bc66de73a94e320724b1bb776a6e4080 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期三, 19 十月 2022 17:43:50 +0800
Subject: [PATCH] 更新minlo
---
src/main/java/com/example/jz/service/impl/CauseServiceImpl.java | 73 +++++++++++++++++++++++++++---------
1 files changed, 55 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/example/jz/service/impl/CauseServiceImpl.java b/src/main/java/com/example/jz/service/impl/CauseServiceImpl.java
index ac5649a..a36d140 100644
--- a/src/main/java/com/example/jz/service/impl/CauseServiceImpl.java
+++ b/src/main/java/com/example/jz/service/impl/CauseServiceImpl.java
@@ -115,6 +115,42 @@
}
@Override
+ public PageParam<CauseVo> getCauserListByCondition(String cause, Integer status, Integer size, Integer current,Integer id) {
+ QueryWrapper<Cause> causeQueryWrapper = new QueryWrapper<>();
+ if (StringUtils.isNotBlank(cause)) {
+ causeQueryWrapper.and(a -> a.like(StringUtils.isNotBlank(cause), "number", cause)
+ .or(StringUtils.isNotBlank(cause))
+ .like(StringUtils.isNotBlank(cause), "name", cause));
+ }
+ if (status != null) {
+ causeQueryWrapper.eq("status", status);
+ }
+ causeQueryWrapper.eq("user_id",id);
+ causeQueryWrapper.orderByDesc("ctime");
+ PageParam<Cause> causePageParam = new PageParam<>();
+ if (size != null) {
+ causePageParam.setSize(size);
+ }
+ if (current != null) {
+ causePageParam.setCurrent(current);
+ }
+ PageParam<Cause> causePage = causeDao.selectPage(causePageParam, causeQueryWrapper);
+ List<CauseVo> causeVos = causePage.getRecords().stream().map(
+ a -> {
+ CauseVo causeVo = new CauseVo();
+ BeanUtils.copyProperties(a, causeVo);
+ causeVo.setUserName(userDao.selectOne(new QueryWrapper<User>().eq("id", a.getUserId())).getRealName());
+ causeVo.setReportNumber(reportDao.selectCount(new QueryWrapper<Report>().eq("cause_id", a.getId())));
+ causeVo.setGroupId(groupDao.selectOne(new QueryWrapper<Group>().eq("cause_id", a.getId())).getId());
+ return causeVo;
+ }).collect(Collectors.toList());
+ PageParam<CauseVo> causeVoPageParam = new PageParam<>();
+ BeanUtils.copyProperties(causePage, causeVoPageParam);
+ causeVoPageParam.setRecords(causeVos);
+ return causeVoPageParam;
+ }
+
+ @Override
public List<UserVo> getManagerList() {
return userDao.selectList(new QueryWrapper<User>().eq("role", 1)).stream().map(a -> {
UserVo userVo = new UserVo();
@@ -136,25 +172,26 @@
public PageParam<CauseReportVo> getReporterList(Integer causeId) {
PageParam<Report> PageParam = new PageParam<>();
PageParam<Report> reportPageParam = reportDao.selectPage(PageParam, new QueryWrapper<Report>().eq("cause_id", causeId).orderByDesc("ctime"));
- List<CauseReportVo> causeReportVos = reportPageParam.getRecords().stream()
- .map(
- a -> {
- CauseReportVo causeReportVo = new CauseReportVo();
- User user = userDao.selectOne(new QueryWrapper<User>().eq("id", a.getUserId()));
- BeanUtils.copyProperties(a, causeReportVo);
- causeReportVo.setMobile(user.getUserMobile());
- causeReportVo.setIdcard(user.getUserIdcard().replaceAll("(?<=[\\d]{3})\\d(?=[\\d]{4})", "*"));
- causeReportVo.setReporterName(user.getRealName());
- if (causeReportVo.getIsInGroup()==1) {
- causeReportVo.setGroupId(groupDao.selectOne(new QueryWrapper<Group>().eq("cause_id",causeId)).getId());
- }
- return causeReportVo;
- }
- ).collect(Collectors.toList());
-
PageParam<CauseReportVo> causeReportVoPageParam = new PageParam<>();
BeanUtils.copyProperties(reportPageParam, causeReportVoPageParam);
- causeReportVoPageParam.setRecords(causeReportVos);
+ if (!reportPageParam.getRecords().isEmpty()){
+ List<CauseReportVo> causeReportVos = reportPageParam.getRecords().stream()
+ .map(
+ a -> {
+ CauseReportVo causeReportVo = new CauseReportVo();
+ User user = userDao.selectOne(new QueryWrapper<User>().eq("id", a.getUserId()));
+ BeanUtils.copyProperties(a, causeReportVo);
+ causeReportVo.setMobile(user.getUserMobile());
+ causeReportVo.setIdcard(user.getUserIdcard().replaceAll("(?<=[\\d]{3})\\d(?=[\\d]{4})", "*"));
+ causeReportVo.setReporterName(user.getRealName());
+ if (causeReportVo.getIsInGroup()==1) {
+ causeReportVo.setGroupId(groupDao.selectOne(new QueryWrapper<Group>().eq("cause_id",causeId)).getId());
+ }
+ return causeReportVo;
+ }
+ ).collect(Collectors.toList());
+ causeReportVoPageParam.setRecords(causeReportVos);
+ }
return causeReportVoPageParam;
}
@@ -252,7 +289,7 @@
.setUserId(user.getId())
.setCtime(new Date())
.setStatus(0)
- .setReportMethod("鐜板満褰曞叆")
+ .setReportMethod("鍚庡彴褰曞叆")
.setIsCommission("0").setReportTime(new Date())
.setCauseId(addReportDto.getCauseId());
reportService.save(report);
--
Gitblit v1.8.0