From 2e34633b3626c3dfbe678b416cfa9fe3e86b58e0 Mon Sep 17 00:00:00 2001
From: qirong <2032486488@qq.com>
Date: 星期四, 09 三月 2023 16:05:22 +0800
Subject: [PATCH] 案件区报案人员编辑以及报案材料导出修改
---
src/main/java/com/example/jz/service/impl/CauseServiceImpl.java | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 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 a36d140..8090b17 100644
--- a/src/main/java/com/example/jz/service/impl/CauseServiceImpl.java
+++ b/src/main/java/com/example/jz/service/impl/CauseServiceImpl.java
@@ -3,6 +3,7 @@
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -58,7 +59,8 @@
UserService userService;
@Resource
ReportService reportService;
-
+ @Resource
+ MessageDao messageDao;
@Resource
AnnouncementDao announcementDao;
@@ -115,7 +117,7 @@
}
@Override
- public PageParam<CauseVo> getCauserListByCondition(String cause, Integer status, Integer size, Integer current,Integer id) {
+ 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)
@@ -125,7 +127,7 @@
if (status != null) {
causeQueryWrapper.eq("status", status);
}
- causeQueryWrapper.eq("user_id",id);
+ causeQueryWrapper.eq("user_id", id);
causeQueryWrapper.orderByDesc("ctime");
PageParam<Cause> causePageParam = new PageParam<>();
if (size != null) {
@@ -174,7 +176,7 @@
PageParam<Report> reportPageParam = reportDao.selectPage(PageParam, new QueryWrapper<Report>().eq("cause_id", causeId).orderByDesc("ctime"));
PageParam<CauseReportVo> causeReportVoPageParam = new PageParam<>();
BeanUtils.copyProperties(reportPageParam, causeReportVoPageParam);
- if (!reportPageParam.getRecords().isEmpty()){
+ if (!reportPageParam.getRecords().isEmpty()) {
List<CauseReportVo> causeReportVos = reportPageParam.getRecords().stream()
.map(
a -> {
@@ -184,8 +186,8 @@
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());
+ if (causeReportVo.getIsInGroup() == 1) {
+ causeReportVo.setGroupId(groupDao.selectOne(new QueryWrapper<Group>().eq("cause_id", causeId)).getId());
}
return causeReportVo;
}
@@ -203,6 +205,11 @@
@Override
public void deleteCause(Integer id) {
causeDao.deleteById(id);
+ Group group = groupDao.selectOne(new LambdaQueryWrapper<Group>().eq(Group::getCauseId, id));
+ if (group!=null){
+ messageDao.delete(new LambdaQueryWrapper<Message>().eq(Message::getGroupId,group.getId()));
+ groupUserDao.delete(new LambdaQueryWrapper<GroupUser>().eq(GroupUser::getGroupId,group.getId()));
+ }
groupDao.delete(new QueryWrapper<Group>().eq("cause_id", id));
}
@@ -279,27 +286,28 @@
}
Group group = groupDao.selectOne(new QueryWrapper<Group>().eq("cause_id", addReportDto.getCauseId()));
// 娣诲姞浜哄憳杩涚兢缁�
- // groupUserDao.insert(new GroupUser().setGroupId(group.getId()).setUserId(user.getId()).setCtime(new Date()).setBanSpeech(0));
+ // groupUserDao.insert(new GroupUser().setGroupId(group.getId()).setUserId(user.getId()).setCtime(new Date()).setBanSpeech(0));
// 娣诲姞鎶ユ淇℃伅
Report report = new Report();
BeanUtils.copyProperties(addReportDto, report);
report
.setIsInGroup(1)
- .setCreator(userDao.selectOne(new QueryWrapper<User>().eq("login_username", SecurityContextHolder.getContext().getAuthentication().getPrincipal())).getId())
+ .setCreator(userDao.selectOne(new QueryWrapper<User>().eq("login_username", SecurityContextHolder.getContext().getAuthentication().getPrincipal())).getId())
.setUserId(user.getId())
.setCtime(new Date())
- .setStatus(0)
- .setReportMethod("鍚庡彴褰曞叆")
- .setIsCommission("0").setReportTime(new Date())
+ .setStatus(1)
+ .setReportMethod("鐜板満鎶ユ")
+ .setIsCommission("0")
+ .setReportTime(new Date())
.setCauseId(addReportDto.getCauseId());
reportService.save(report);
- return groupUserDao.insert(new GroupUser().setGroupId(group.getId()).setUserId(report.getId()).setCtime(new Date()).setBanSpeech(0))> 0;
+ return groupUserDao.insert(new GroupUser().setGroupId(group.getId()).setUserId(report.getId()).setCtime(new Date()).setBanSpeech(0)) > 0;
}
@Override
public List<Map<String, String>> getCauseIdAndName() {
ArrayList<Map<String, String>> maps = new ArrayList<>();
- causeDao.selectList(null).stream().forEach(a -> {
+ causeDao.selectList(new QueryWrapper<Cause>().eq("status", 0).or().eq("status", 2)).stream().forEach(a -> {
Map<String, String> map = new HashMap<>();
map.put("id", a.getId().toString());
map.put("name", a.getName());
@@ -310,13 +318,13 @@
@Override
@SneakyThrows
- public void loadFileReport(MultipartFile multipartFile,Integer causeId) {
+ public void loadFileReport(MultipartFile multipartFile, Integer causeId) {
EasyExcel.read(multipartFile.getInputStream(), AddReportLoadDto.class, new AnalysisEventListener<AddReportLoadDto>() {
@Override
public void invoke(AddReportLoadDto data, AnalysisContext context) {
- if (StringUtils.isNotBlank(data.getReporterName())&&StringUtils.isNotBlank(data.getIdcard())){
+ if (StringUtils.isNotBlank(data.getReporterName()) && StringUtils.isNotBlank(data.getIdcard())) {
AddReportDto addReportDto = new AddReportDto();
- BeanUtils.copyProperties(data,addReportDto);
+ BeanUtils.copyProperties(data, addReportDto);
addReportDto.setCauseId(causeId);
addReportPeople(addReportDto);
}
--
Gitblit v1.8.0