修改

xuhy

2024-10-30 923f13b2ac81f444376b946d073e3c3170e06f1b

修改

 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;


 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")

 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){