From 39f55c08933e7f0292c325f41b0f55390a4acc69 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期一, 25 七月 2022 09:24:05 +0800
Subject: [PATCH] 添加验证,更新前端,修复bug
---
src/main/java/com/example/jz/service/impl/CauseServiceImpl.java | 40 ++++++++++++++++++++++++++++++----------
1 files changed, 30 insertions(+), 10 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 85c5762..25e66ce 100644
--- a/src/main/java/com/example/jz/service/impl/CauseServiceImpl.java
+++ b/src/main/java/com/example/jz/service/impl/CauseServiceImpl.java
@@ -26,9 +26,7 @@
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -151,6 +149,7 @@
@Override
public void deleteCause(Integer id) {
causeDao.deleteById(id);
+ groupDao.delete(new QueryWrapper<Group>().eq("cause_id",id));
}
@Override
@@ -158,10 +157,12 @@
@Transactional(rollbackFor = BusinessException.class)
public void loadFile(MultipartFile multipartFile) {
ArrayList<CauseLoadDto> causeLoadDtos = new ArrayList<>();
- EasyExcel.read(multipartFile.getInputStream(),CauseLoadDto.class, new AnalysisEventListener<CauseLoadDto>() {
+ EasyExcel.read(multipartFile.getInputStream(), CauseLoadDto.class, new AnalysisEventListener<CauseLoadDto>() {
@Override
public void invoke(CauseLoadDto data, AnalysisContext context) {
- causeLoadDtos.add(data);
+ if (StringUtils.isNotBlank(data.getName())&&StringUtils.isNotBlank(data.getUserName())){
+ causeLoadDtos.add(data);
+ }
}
@Override
@@ -175,7 +176,7 @@
a -> {
Cause cause = new Cause();
BeanUtils.copyProperties(a, cause);
- if (StringUtils.isBlank(a.getStatus())){
+ if (StringUtils.isBlank(a.getStatus())) {
throw new BusinessException("鐘舵�佷笉鑳戒负绌�");
}
if (a.getStatus().equals(CauseEnums.UNCHECKED.getMsg())) {
@@ -194,14 +195,21 @@
cause.setStatus(CauseEnums.HASBEENDROPPED.value());
}
cause.setCtime(new Date());
- if (StringUtils.isBlank(a.getUserName())){
+ if (StringUtils.isBlank(a.getUserName())) {
throw new BusinessException("璐熻矗浜轰笉鍏佽涓虹┖");
}
- if (userDao.selectOne(new QueryWrapper<User>().eq("real_name", a.getUserName()))==null){
+ if (userDao.selectOne(new QueryWrapper<User>().eq("real_name", a.getUserName())) == null) {
throw new BusinessException("璐熻矗浜轰笉瀛樺湪");
}
- cause.setUserId(userDao.selectOne(new QueryWrapper<User>().eq("real_name", a.getUserName())).getId());
- causeDao.insert(cause);
+ Integer id = userDao.selectOne(new QueryWrapper<User>().eq("real_name", a.getUserName())).getId();
+ cause.setUserId(id);
+ causeService.save(cause);
+ Group group = new Group();
+ group.setCtime(new Date());
+ group.setUserId(id);
+ group.setGroupName(a.getName());
+ group.setCauseId(cause.getId());
+ groupDao.insert(group);
});
}
@@ -229,4 +237,16 @@
.setCauseId(groupDao.selectOne(new QueryWrapper<Group>().eq("id", addReportDto.getGroupId())).getCauseId());
return reportDao.insert(report) > 0;
}
+
+ @Override
+ public List<Map<String, String>> getCauseIdAndName() {
+ ArrayList<Map<String, String>> maps = new ArrayList<>();
+ causeDao.selectList(null).stream().forEach(a -> {
+ Map<String, String> map = new HashMap<>();
+ map.put("id", a.getId().toString());
+ map.put("name", a.getName());
+ maps.add(map);
+ });
+ return maps;
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0