From 923f13b2ac81f444376b946d073e3c3170e06f1b Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 30 十月 2024 19:29:19 +0800
Subject: [PATCH] 修改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFoundationPersonServiceImpl.java | 15 ++++++++++++---
ruoyi-system/src/main/java/com/ruoyi/system/domain/TFoundationPerson.java | 2 ++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFoundationPersonController.java | 1 +
3 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFoundationPersonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFoundationPersonController.java
index cf652a1..e800cb0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFoundationPersonController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFoundationPersonController.java
@@ -18,6 +18,7 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import oshi.driver.unix.aix.Ls;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TFoundationPerson.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TFoundationPerson.java
index 689dc72..76e9294 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TFoundationPerson.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TFoundationPerson.java
@@ -10,6 +10,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
+import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.time.LocalDateTime;
@@ -33,6 +34,7 @@
private Long id;
@ApiModelProperty(value = "用餐人数")
+ @NotNull(message = "用餐人数不能为空")
@TableField("mealCount")
private Integer mealCount;
@ApiModelProperty(value = "店铺id")
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..7212aad 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){
--
Gitblit v1.7.1