From facc498b400eb52431452cfac2088e1c78d275ec Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 31 十月 2024 09:52:28 +0800
Subject: [PATCH] 修改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFoundationPersonServiceImpl.java | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFoundationPersonServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFoundationPersonServiceImpl.java
index 70e8cfb..52a9bcd 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFoundationPersonServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFoundationPersonServiceImpl.java
@@ -41,7 +41,12 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void add(TFoundationPersonBatchDTO dto) {
- for (TFoundationPersonDTO tFoundationPersonDTO : dto.getFoundationPersonDTOS()) {
+ List<TFoundationPersonDTO> foundationPersonDTOS = dto.getFoundationPersonDTOS();
+ boolean b = hasDuplicateId(foundationPersonDTOS);
+ if(b){
+ throw new ServiceException("设置存在重复用餐人数");
+ }
+ for (TFoundationPersonDTO tFoundationPersonDTO : foundationPersonDTOS) {
List<TFoundationConfig> foundationConfigs = tFoundationPersonDTO.getFoundationConfigs();
long count = foundationConfigs.stream().map(TFoundationConfig::getTypeId).distinct().count();
if(foundationConfigs.size()!=count){
@@ -59,8 +64,12 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void edit(TFoundationPersonBatchDTO dto) {
-
- for (TFoundationPersonDTO tFoundationPersonDTO : dto.getFoundationPersonDTOS()) {
+ List<TFoundationPersonDTO> foundationPersonDTOS = dto.getFoundationPersonDTOS();
+ boolean b = hasDuplicateId(foundationPersonDTOS);
+ if(b){
+ throw new ServiceException("设置存在重复用餐人数");
+ }
+ for (TFoundationPersonDTO tFoundationPersonDTO : foundationPersonDTOS) {
List<TFoundationConfig> foundationConfigs = tFoundationPersonDTO.getFoundationConfigs();
long count = foundationConfigs.stream().map(TFoundationConfig::getTypeId).distinct().count();
if(foundationConfigs.size()!=count){
@@ -111,4 +120,23 @@
}
return false; // 没有发现重复的人数
}
+
+ @Override
+ public List<TFoundationPersonVO> getSetList(TFoundationPersonQuery query) {
+ List<TFoundationPersonVO> list = this.baseMapper.getSetList(query);
+ List<Long> ids = list.stream().map(TFoundationPersonVO::getId).collect(Collectors.toList());
+ if(!CollectionUtils.isEmpty(ids)){
+ List<TFoundationConfig> list1 = foundationConfigService.list(Wrappers.lambdaQuery(TFoundationConfig.class)
+ .in(TFoundationConfig::getPersonId, ids));
+ list.forEach(item -> {
+ List<TFoundationConfig> collect = list1.stream().filter(item1 -> item1.getPersonId().equals(item.getId())).collect(Collectors.toList());
+ if(!CollectionUtils.isEmpty(collect)){
+ item.setMinDish(collect.stream().sorted(Comparator.comparingInt(TFoundationConfig::getMinCount)).findFirst().get().getMinCount());
+ item.setMaxDish(collect.stream().sorted(Comparator.comparingInt(TFoundationConfig::getMaxCount).reversed()).findFirst().get().getMaxCount());
+ item.setFoundationConfigs(collect);
+ }
+ });
+ }
+ return list;
+ }
}
--
Gitblit v1.7.1