From 2b278a1aa078b39d891f3eb00aac729ed2c1c5b3 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期一, 25 七月 2022 17:28:58 +0800
Subject: [PATCH] 报案人查询分页处理,处理案件早发时间 修改问题
---
src/main/java/com/example/jz/modle/vo/CauseVo.java | 2 +-
src/main/java/com/example/jz/controller/CauseController.java | 2 +-
src/main/java/com/example/jz/service/impl/CauseServiceImpl.java | 13 +++++++++----
src/main/java/com/example/jz/service/CauseService.java | 2 +-
4 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/example/jz/controller/CauseController.java b/src/main/java/com/example/jz/controller/CauseController.java
index 6b8201d..39e636c 100644
--- a/src/main/java/com/example/jz/controller/CauseController.java
+++ b/src/main/java/com/example/jz/controller/CauseController.java
@@ -61,7 +61,7 @@
@ApiOperation(httpMethod = "PUT", value = "妗堜欢鍙�-妗堜欢褰曞叆-淇敼妗堜欢")
@PutMapping("/updateCause")
@ApiResponse(message = "鎵ц鎴愬姛", code = 200)
- public R updateCause(@RequestBody CauseDto causeDto, Integer id) {
+ public R updateCause(@RequestBody @Validated CauseDto causeDto, Integer id) {
return R.ok(causeService.updateCause(causeDto, id));
}
diff --git a/src/main/java/com/example/jz/modle/vo/CauseVo.java b/src/main/java/com/example/jz/modle/vo/CauseVo.java
index 50a8eac..d27fbc6 100644
--- a/src/main/java/com/example/jz/modle/vo/CauseVo.java
+++ b/src/main/java/com/example/jz/modle/vo/CauseVo.java
@@ -24,7 +24,7 @@
//绗竴娆℃鍙戞椂闂�
@ApiModelProperty(dataType = "Date", value = "绗竴娆℃鍙戞椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+// @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date firstTime;
//鍒涘缓鏃堕棿
diff --git a/src/main/java/com/example/jz/service/CauseService.java b/src/main/java/com/example/jz/service/CauseService.java
index 5cdaf1a..0fc2289 100644
--- a/src/main/java/com/example/jz/service/CauseService.java
+++ b/src/main/java/com/example/jz/service/CauseService.java
@@ -56,7 +56,7 @@
* @Param [causeId]
* @return java.util.List<com.example.jz.modle.vo.CauseReportVo>
**/
- List<CauseReportVo> getReporterList(Integer causeId);
+ PageParam<CauseReportVo> getReporterList(Integer causeId);
/**
* @Description 妗堜欢缇ゅ叕鍛�
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 25e66ce..c2a73b9 100644
--- a/src/main/java/com/example/jz/service/impl/CauseServiceImpl.java
+++ b/src/main/java/com/example/jz/service/impl/CauseServiceImpl.java
@@ -125,8 +125,10 @@
}
@Override
- public List<CauseReportVo> getReporterList(Integer causeId) {
- return reportDao.selectList(new QueryWrapper<Report>().eq("cause_id", causeId)).stream()
+ public PageParam<CauseReportVo> getReporterList(Integer causeId) {
+ PageParam<Report> PageParam = new PageParam<>();
+ PageParam<Report> reportPageParam = reportDao.selectPage(PageParam, new QueryWrapper<Report>().eq("cause_id", causeId));
+ reportPageParam.getRecords().stream()
.map(
a -> {
CauseReportVo causeReportVo = new CauseReportVo();
@@ -139,6 +141,9 @@
return causeReportVo;
}
).collect(Collectors.toList());
+ PageParam<CauseReportVo> causeReportVoPageParam = new PageParam<>();
+ BeanUtils.copyProperties(reportPageParam, causeReportVoPageParam);
+ return causeReportVoPageParam;
}
@Override
@@ -149,7 +154,7 @@
@Override
public void deleteCause(Integer id) {
causeDao.deleteById(id);
- groupDao.delete(new QueryWrapper<Group>().eq("cause_id",id));
+ groupDao.delete(new QueryWrapper<Group>().eq("cause_id", id));
}
@Override
@@ -160,7 +165,7 @@
EasyExcel.read(multipartFile.getInputStream(), CauseLoadDto.class, new AnalysisEventListener<CauseLoadDto>() {
@Override
public void invoke(CauseLoadDto data, AnalysisContext context) {
- if (StringUtils.isNotBlank(data.getName())&&StringUtils.isNotBlank(data.getUserName())){
+ if (StringUtils.isNotBlank(data.getName()) && StringUtils.isNotBlank(data.getUserName())) {
causeLoadDtos.add(data);
}
}
--
Gitblit v1.8.0