From 1c3f11dfd7493a4c4a8d41e2499477840bcc070c Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期五, 19 五月 2023 15:01:46 +0800
Subject: [PATCH] 限制文件大小，用户，报案人审核筛选
---
src/main/java/com/example/jz/modle/entity/Cause.java | 2 +-
src/main/resources/mapper/ReportDao.xml | 2 +-
src/main/java/com/example/jz/modle/dto/CauseReportExpDto.java | 13 +++++++++----
src/main/java/com/example/jz/utils/EasyExcelUtils.java | 2 +-
src/main/java/com/example/jz/controller/UserController.java | 12 +++++++++---
src/main/java/com/example/jz/controller/PublicityController.java | 2 --
src/main/java/com/example/jz/service/impl/CauseServiceImpl.java | 4 +++-
src/main/resources/application-pro.yml | 3 ++-
8 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/example/jz/controller/PublicityController.java b/src/main/java/com/example/jz/controller/PublicityController.java
index 4d03c3a..6256a0e 100644
--- a/src/main/java/com/example/jz/controller/PublicityController.java
+++ b/src/main/java/com/example/jz/controller/PublicityController.java
@@ -11,11 +11,9 @@
import com.example.jz.modle.entity.User;
import com.example.jz.modle.vo.PublicityVo;
import com.example.jz.service.PublicityService;
-import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
-import io.swagger.models.auth.In;
import lombok.SneakyThrows;
import org.springframework.beans.BeanUtils;
import org.springframework.security.core.context.SecurityContextHolder;
diff --git a/src/main/java/com/example/jz/controller/UserController.java b/src/main/java/com/example/jz/controller/UserController.java
index a677c23..c8ad0d0 100644
--- a/src/main/java/com/example/jz/controller/UserController.java
+++ b/src/main/java/com/example/jz/controller/UserController.java
@@ -63,7 +63,7 @@
@GetMapping
@ApiOperation("鍒嗛〉鏌ヨ鎵�鏈夋暟鎹�")
public R selectAll(Page<User> page, User user) {
- return R.ok(this.userService.page(page, new QueryWrapper<User>()
+ R<Page<User>> res = R.ok(this.userService.page(page, new QueryWrapper<User>()
.eq("role", 0)
.and(StringUtils.isNotBlank(user.getNickName()) && StringUtils.isNotBlank(user.getRealName()), new Consumer<QueryWrapper<User>>() {
@Override
@@ -72,9 +72,15 @@
}
})
.like(StringUtils.isNotBlank(user.getNickName()) && StringUtils.isBlank(user.getRealName()), "nick_name", user.getNickName())
- .or()
- .like(StringUtils.isNotBlank(user.getRealName()) && StringUtils.isBlank(user.getNickName()), "real_name", user.getRealName())
+ .and(StringUtils.isNotBlank(user.getRealName()) && StringUtils.isBlank(user.getNickName()), new Consumer<QueryWrapper<User>>() {
+ @Override
+ public void accept(QueryWrapper<User> userQueryWrapper) {
+ userQueryWrapper.like("real_name", user.getRealName());
+ }
+ })
+// .like(StringUtils.isNotBlank(user.getRealName()) && StringUtils.isBlank(user.getNickName()), "real_name", user.getRealName())
.orderByDesc("ctime")));
+ return res;
}
/**
diff --git a/src/main/java/com/example/jz/modle/dto/CauseReportExpDto.java b/src/main/java/com/example/jz/modle/dto/CauseReportExpDto.java
index eb24325..b21a091 100644
--- a/src/main/java/com/example/jz/modle/dto/CauseReportExpDto.java
+++ b/src/main/java/com/example/jz/modle/dto/CauseReportExpDto.java
@@ -46,14 +46,19 @@
@ColumnWidth(20)
private String workingLocation;
- @ApiModelProperty(value = "鍒涘缓鏃堕棿",dataType = "Date",position = 6)
- @ExcelProperty(value = "鍒涘缓鏃堕棿", index = 6)
+ @ApiModelProperty(value = "娑夋閲戦",dataType = "String", position = 6)
+ @ExcelProperty(value = "娑夋閲戦",index = 6)
+ @ColumnWidth(20)
+ private Double amountInvolved;
+
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿",dataType = "Date",position = 7)
+ @ExcelProperty(value = "鍒涘缓鏃堕棿", index = 7)
@DateTimeFormat("yyyy/MM/dd HH:mm:ss")
@ColumnWidth(20)
private Date ctime;
- @ApiModelProperty(value = "澶囨敞",dataType = "String", position = 7)
- @ExcelProperty(value = "澶囨敞",index = 7)
+ @ApiModelProperty(value = "澶囨敞",dataType = "String", position = 8)
+ @ExcelProperty(value = "澶囨敞",index = 8)
@ColumnWidth(20)
private String userMemo;
}
diff --git a/src/main/java/com/example/jz/modle/entity/Cause.java b/src/main/java/com/example/jz/modle/entity/Cause.java
index a55b3c8..c0f3a71 100644
--- a/src/main/java/com/example/jz/modle/entity/Cause.java
+++ b/src/main/java/com/example/jz/modle/entity/Cause.java
@@ -25,7 +25,7 @@
private Date firstTime;
//鍒涘缓鏃堕棿
private Date ctime;
- //鐘舵�� 0鏈鏍� 1涓嶄簣绔嬫 2鍙楃悊涓� 3宸茬粨妗�
+ //鐘舵�� 0绔嬫 1鍒濇煡 2鍙楃悊 3绉婚�佽捣璇� 4缁撴
private Integer status;
//璐熻矗浜篿d
private Integer userId;
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 6c4b793..bc237bc 100644
--- a/src/main/java/com/example/jz/service/impl/CauseServiceImpl.java
+++ b/src/main/java/com/example/jz/service/impl/CauseServiceImpl.java
@@ -246,6 +246,7 @@
List<CauseReportExpDto> res = users.stream().map(new Function<User, CauseReportExpDto>() {
@Override
public CauseReportExpDto apply(User user) {
+ Double amountInvolved = reportDao.selectOne(Wrappers.<Report>lambdaQuery().eq(Report::getCauseId, causeId).eq(Report::getUserId, user.getId())).getAmountInvolved();
CauseReportExpDto build = CauseReportExpDto.builder()
.realName(user.getRealName())
.userMobile(user.getUserMobile())
@@ -254,6 +255,7 @@
.sex(user.getSex())
.location(user.getLocation())
.workingLocation(user.getWorkingLocation())
+ .amountInvolved(amountInvolved)
.ctime(user.getCtime())
.userMemo(user.getUserMemo())
.build();
@@ -378,7 +380,7 @@
@Override
public List<Map<String, String>> getCauseIdAndName() {
ArrayList<Map<String, String>> maps = new ArrayList<>();
- causeDao.selectList(new QueryWrapper<Cause>().eq("status", 0).or().eq("status", 2)).stream().forEach(a -> {
+ causeDao.selectList(null).stream().forEach(a -> {
Map<String, String> map = new HashMap<>();
map.put("id", a.getId().toString());
map.put("name", a.getName());
diff --git a/src/main/java/com/example/jz/utils/EasyExcelUtils.java b/src/main/java/com/example/jz/utils/EasyExcelUtils.java
index 40b467e..153385d 100644
--- a/src/main/java/com/example/jz/utils/EasyExcelUtils.java
+++ b/src/main/java/com/example/jz/utils/EasyExcelUtils.java
@@ -31,7 +31,7 @@
fileName = URLEncoder.encode(fileName, "UTF-8");
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding("utf-8");
- response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) + ".xlsx");
+ response.setHeader("Content-disposition", "attachment;filename*=" + fileName + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) + ".xlsx");
EasyExcel.write(response.getOutputStream(), className)
.sheet(sheetName)
.doWrite(collection);
diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml
index 65dcb69..f013b02 100644
--- a/src/main/resources/application-pro.yml
+++ b/src/main/resources/application-pro.yml
@@ -24,7 +24,8 @@
validation-timeout: 1000
servlet:
multipart:
- max-file-size: 50MB
+ max-file-size: 1024MB
+ max-request-size: 2048MB
jackson:
date-format: yyyy-MM-dd HH:mm:ss
time-zone: GMT+8
diff --git a/src/main/resources/mapper/ReportDao.xml b/src/main/resources/mapper/ReportDao.xml
index 2d24295..9cc3ee9 100644
--- a/src/main/resources/mapper/ReportDao.xml
+++ b/src/main/resources/mapper/ReportDao.xml
@@ -9,7 +9,7 @@
<where>
1=1
<if test="reportParamDto.people != ''">
- and (u.real_name like '%${reportParamDto.people}%' or u.user_idcard like '%${reportParamDto.people}%')
+ and (u.real_name like '%${reportParamDto.people}%')
</if>
<if test="reportParamDto.phoneNumber != ''">
and u.user_mobile like '%${reportParamDto.phoneNumber}%'
--
Gitblit v1.8.0